Commit Graph

77 Commits

Author SHA1 Message Date
Tor Arne Vestbø
edba9cddbb testlib: Accurately name JUnit test, and only run for JUnitXML reporter
The JUnit reporter was initially named xunit, but the naming was inaccurate
and the reporter was renamed in 27db9e458c.

The corresponding test has now been renamed as well, and as an added bonus
we only run it for that reporter.

Pick-to: 6.2
Change-Id: I59cb7d949514cdf46a0199a53a7a3e39f833207c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-07-29 15:39:40 +02:00
Ievgenii Meshcheriakov
e52c9d560c .gitignore: Ignore __pycache__ directories
Ignore cache directories created by Python 3.

Change-Id: Ie1721de8c85a2d4f7e37ec434beba9e53e2d21a1
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2021-07-07 19:05:25 +02:00
Kai Koehne
01697c5f9b .gitignore: Qt Creator files cleanup
Move Qt Creator files to a common section, like for the other
IDE's. While at it, fix CMakeLists.txt.user*.

Change-Id: I978c5698204c35ef8f14d2261e7875160484d0e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-25 07:50:15 +02:00
Andreas Buhr
1c883682ee git: ignore CLion configuration files
modify .gitignore file to ignore the '.idea' directory created by CLion.

Change-Id: I63ca2fc8e3710ebcb08e99c7ad89d3bd57721dbd
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
2020-09-25 07:50:10 +02:00
Eskil Abrahamsen Blomfeldt
f70b955ce8 Remove the QPF2 font engine
The QPF2 font engine has been kept around for compatibility
reasons in Qt 5.x, and it is time for it to retire for now. If
we want something like this in the future, we can revive it with
hardware acceleration / Qt Quick as one of the primary use cases,
but for now, it seems that Freetype and our existing caching is
sufficient also for low-end use cases.

[ChangeLog][QtGui][Text] Removed support for the legacy QPF2 font
format as well as the makeqpf tool used to generate those files.

Change-Id: Id43039c92fe5bd95b628cd769e045c029f39a350
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-08-24 07:08:45 +02:00
Kai Koehne
5ca6db99a9 git: Ignore CMakeLists.txt.user
Created by Qt Creator

Change-Id: I33f8a447a166adb5ec3d4db11d2dd3bcfc0104b6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-07-24 17:26:51 +02:00
Karsten Heimrich
18ec53156e Move QTextCodec support out of QtCore
* Assume UTF-8 on all Unix like systems
* Export some functions to be able to compile QTextCodec once
  moved to Qt5Compat.

Task-number: QTBUG-75665
Change-Id: I52ec47a848bc0ba72e9c7689668b1bcc5d736c29
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-06-20 02:04:38 +02:00
Oliver Wolff
45b0f1be68 Remove winrt
Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.

Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-06-06 20:25:49 +02:00
Laszlo Agocs
752497910b Remove ANGLE
This marks the end of EGL and OpenGL ES support on Windows.

The concepts of -opengl dynamic, -opengl desktop, QT_OPENGL=software,
etc. remain unchanged, with the exception of the disapperance of
everything ANGLE related.

CMake builds now work identically to qmake on Windows: they default to
'dynamic' OpenGL on Windows, unless -DINPUT_opengl=desktop is specified.

On Windows, Qt 6 is expected to default to the "dynamic" OpenGL model by
default, just like Qt 5.15. This can be changed by switching to "desktop"
OpenGL, which will link to opengl32 (publicly, so other libs and applications
will do so as well) and disallows using another OpenGL DLL.

The "dynamic" mode is essential still because the fallback to a software
rasterizer, such as the opengl32sw.dll we ship with the Qt packages,
has to to work exactly like in Qt 5, the removal of ANGLE does not
change this concept in any way (except of course that the middle option
of using ANGLE is now gone)

When it comes to the windows plugin's OpenGL blacklist feature, it works
like before and accepts the ANGLE/D3D related keywords. They will
then be ignored. Similarly, requesting QT_OPENGL=angle is ignored (but
will show a warning).

The D3D11 and DXGI configure time tests are removed: Qt 5.14 already
depends on D3D 11.1 and DXGI 1.3 headers being available unconditionally
on Win32 (in QRhi's D3D11 backend). No need to test for these.

[ChangeLog][Windows] ANGLE is no longer included with Qt. Dynamic OpenGL
builds work like before but ANGLE is no longer an option. OpenGL proper
or an alternative opengl32 implementation are the two remaining options
now. Attempting to set QT_OPENGL=angle or Qt::AA_UseOpenGLES will have
no effect on Windows.

Fixes: QTBUG-79103
Change-Id: Ia404e0d07f3fe191b27434d863c81180112ecb3b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-05-26 15:11:40 +02:00
Kai Koehne
1381b59222 Remove last remainings of Qt Quick 1 imports
amends  e1fd607493

Change-Id: I4587ae287635bc9718325a24bee728f1c1938978
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-25 11:48:12 +02:00
Gustavo Carneiro
09da7f470e Add .vscode in git ignore list
Add a .vscode line in the .gitignore file to ignore the Visual Studio Code auto generated files.

Add a .vscode line in the .gitignore file to ignore the Visual Studio Code auto generated files.

Change-Id: Ifbcf82a9c23b4ecf35ae9fd84787f7e1e29df47b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2020-04-22 20:38:52 -03:00
Mårten Nordheim
d8b49e6b51 QtNetwork: Delete bearer management
All remaining pieces are gone, configuration included.

Relevant CMakeLists and configure.cmake were regenerated.

Fixes: QTBUG-76502
Change-Id: I667b5da7e3802830d236d50b5e9190c2ee9c19e2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-04-05 16:41:08 +02:00
Lars Knoll
f4e6106047 Ignore some build artifacts when doing in-tree builds with cmake
Change-Id: I00b08aa0051ac0c2438e59845f5fb2991a94569f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-02 07:41:33 +01:00
Alexandru Croitor
4dac45c9ee Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277
2019-07-11 17:17:51 +02:00
Thiago Macieira
5e40d3d982 qfloat16: Check in the tables to Git
It's a 38k source file, which makes it MUCH smaller than other generated
files like qlocale_data_p.h (982k) and qunicodetables.cpp (718k). The
constants are platform-independent, since they are defined by IEEE 754,
so they will never change.

The generator tool is moved to util/ and removed from the build. That's
one fewer bootstrapped tool to have to worry about.

The output file is committed as .cpp so it won't get installed.

Fixes: QTBUG-76165
Change-Id: I2b1955a995ad40f3b89afffd15a3ded58dc3e35f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2019-06-03 10:42:53 -07:00
Tobias Hunger
6630937e63 Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
2019-04-16 16:32:08 +02:00
Tobias Hunger
05ebd62f09 .gitignore: Do not ignore stuff in examples for the time being
Change-Id: Iccf61b6613c4cd82a10051eac448711400a27ea1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-03-26 13:03:20 +00:00
Simon Hausmann
ab2265cad7 Ignore cmake build directories that are typically in place
Change-Id: Icc31c4ac348bd55af383626ff86cae91e695d274
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-02-11 10:15:13 +00:00
Kai Koehne
1983abddc0 Remove support for qml1 plugins and modules
The Qt Quick 1 module got dropped in Qt 5.6, and
almost certainly doesn't compile anymore.

Change-Id: Ia1ae6937e9cc4d99508be8eeeff9b12d0f001002
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-11-15 19:52:13 +00:00
Simon Hausmann
e9c45bbddd Begin port of qtbase to CMake
Done-by: Alexandru Croitor <alexandru.croitor@qt.io>
Done-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Done-by: Kevin Funk <kevin.funk@kdab.com>
Done-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Done-by: Simon Hausmann <simon.hausmann@qt.io>
Done-by: Tobias Hunger <tobias.hunger@qt.io>
Done-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Done-by: Volker Krause <volker.krause@kdab.com>
Change-Id: Ida4f8bd190f9a4849a1af7b5b7981337a5df5310
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
2018-11-01 11:48:46 +00:00
Jake Petroules
dfa172034e gitignore: don't ignore Info.plist templates for libraries
Change-Id: Ifa17c9b1d1b5572d8256e2729a1cb2a749f58635
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-11-23 07:07:48 +00:00
Orgad Shaneh
add5de8508 Update gitignore
Change-Id: I3d525e523e457524daf6afae390559d943286a6a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2017-11-11 21:05:34 +00:00
Orgad Shaneh
ca5f5de5c9 GitIgnore qvkgen
Change-Id: I6f6551821ffcd73841e4b5cab5892bd17f5c70b9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-10-19 10:59:09 +00:00
Orgad Shaneh
1a5fa66269 GitIgnore config.status.bat and config.tests/.qmake.stash
Change-Id: Ia53119f8fbbe13b4865378833dcdac73c9368d9b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-06-13 05:58:30 +00:00
Oswald Buddenhagen
46d060f588 Overhaul .gitignore
Started-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Change-Id: I2c6fba0532549b952570ec50659934e14ea9cdd5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-16 15:11:05 +00:00
Glen Mabey
3ab7016632 New qfloat16 class
This constitutes a fairly complete submission of an entirely new
floating point type which conforms to IEEE 754 as a 16-bit storage
class.  Conversion between qfloat16 and float is currently performed
through a sequence of lookup tables.  Global-level functions
qRound(), qRound64(), qFuzzyCompare(), qFuzzyIsNull(), and
qIsNull() each with a qfloat16 parameter have been included
for completeness.

[ChangeLog][QtCore] Added new qfloat16 class.

Change-Id: Ia52eb27846965c14f8140c00faf5ba33c9443976
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2017-01-31 14:21:42 +00:00
Giuseppe D'Angelo
a7d34eff8f Update .gitignore
Change-Id: If4de9b2f2b469f45b2d579d0401bde44d3477d3c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-01-18 10:58:02 +00:00
Oswald Buddenhagen
5a4d469dcb rename configure.exe => configureapp.exe
now that the bat file is responsible for displaying the help in addition
to bootstrapping configure, the exe file should not shadow it any more.

amends c027cffbe.

Change-Id: I5c8a52f59ff455575e646fae55cd214db98a3736
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-10-04 08:25:08 +00:00
Liang Qi
1cc571593a Merge remote-tracking branch 'origin/5.7' into 5.8
cf53aa21bf and 3aaa5d6b32
were reverted because of reconstruction in 5.7.

defineTest(qtConfTest_checkCompiler) in configure.pri is smart
enough to cover the case in a9474d1260.

DirectWrite: Fix advances being scaled to 0

Since 131eee5cd, the stretch of a font can be 0, meaning
"whatever the font provides". In combination with ec7fee96,
this would cause advances in the DirectWrite engine to be scaled to
0, causing the QRawFont test to fail.

Conflicts:
	configure
	mkspecs/features/uikit/device_destinations.sh
	mkspecs/features/uikit/xcodebuild.mk
	src/corelib/global/qglobal.cpp
	src/corelib/global/qnamespace.qdoc
	src/plugins/platforms/cocoa/qcocoamenuitem.h
	src/plugins/platforms/windows/qwindowsservices.cpp
	src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
	src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
	src/widgets/kernel/qapplication.cpp
	tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
	tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp

Change-Id: I4656d8133da7ee9fcc84ad3f1c7950f924432d1e
2016-08-29 15:30:17 +02:00
Maurice Kalinowski
ccccdbaf74 Update gitignore
Add files generated for winrt Visual Studio projects

Change-Id: I7e6bf120b115743b836107be4e83147dd671cbe3
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2016-08-19 10:43:26 +00:00
Oswald Buddenhagen
2b31f47098 rename the -redo status file to config.opt
configure.cache is really kinda misleading.

the old name is still recognized for backwards compat.

Change-Id: I5ca461e99a0f9336ad70adfa5b8f6bb81ad73bbb
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-12 22:03:05 +00:00
Edward Welbourne
f6fc34294f Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
2016-08-01 18:20:00 +02:00
Giuseppe D'Angelo
b27065014f Update .gitignore
Change-Id: Id90e9441d0e30ec5468032328b890577c349c320
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-26 19:53:09 +00:00
Giuseppe D'Angelo
7095db3633 Update .gitignore
Change-Id: Ib091f294c8557a44a2c39594fcf6f2d39de1d7e2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-26 11:48:21 +00:00
Jake Petroules
5c2d30c19e Ignore more build artifacts from in-source builds.
Change-Id: I2cc810099d67692314edda7cf024ba0f7fb25012
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-06-16 07:06:37 +00:00
Oswald Buddenhagen
5bbbea4c83 normalize structure of plugandpaint example
as in other examples which come with plugins, use an additional
hierarchy level which contains the app and plugin subdirs.

Change-Id: I2487755967aa3474c337c8c8af10be49627b63d0
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-05-03 10:25:18 +00:00
Oswald Buddenhagen
282f15feaa rewrite qtAddToolEnv()
the primary purpose is making env var prepend mode work for unset
variables on windows. this is achieved by using a conditional and delayed
variable expansion. however, the latter is disabled by default and can
be locally enabled only in batch files. therefore, write wrapper scripts
and substitute them for the actual commands. we do this also on unix,
both for consistency and simply because the commands look much less
confusing.

this change is slightly backwards-incompatible, as invoking
qtAddToolEnv() multiple times on the same command will now make a total
mess. also, invoking it on a command that contains 'make' macro
expansions isn't a good idea, so testcase.prf needed an adjustment. the
function is an undocumented internal, so Nobody Should Care (TM).

this also reverts 80ebedecf9, as it's obsolete now.

Change-Id: I8394b77868b495abcf27b688996ca74c40b80994
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-08 09:36:13 +00:00
Rainer Keller
fcc6b6daff Remove qtdemo from gitignore
QtDemo was removed with a commit in qtdoc.

Change-Id: I1803e041e7da57641148a37691ffdc6ae6c85ad9
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-09-17 12:38:55 +02:00
Frederik Gladhorn
c8113ad0a4 Add .dylib and .d to .gitignore
This makes in-source builds on mac somewhat bearable.

Change-Id: I8c9e8e470acf90b03ee25e21dbbdd61ae2656820
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-03-29 00:40:46 +01:00
Orgad Shaneh
6d8b84e8d5 GitIgnore updates
* ANGLE artifacts
* qfeatures

Change-Id: I3cb8f78bf02119233f115ec53d536c05dd9776e7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-12-09 17:28:18 +01:00
David Faure
404598b613 Long live QCommandLineParser!
The QCommandLineParser class provides a means for handling the command line options.

QCoreApplication provides the command-line arguments as a simple list of strings.
QCommandLineParser provides the ability to define a set of options, parse the
command-line arguments, and store which options have actually been used, as
well as option values.

Done-with: Laszlo Papp <lpapp@kde.org>

Change-Id: Ic7bebc10b3f8d8dd06ad0f4bb897c51d566e3b7c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-08-24 21:33:39 +02:00
Sergio Ahumada
1696f45d92 configure: Remove v8snapshot vestiges
Change-Id: I0a43320ca0ab7cc416b07396ebc795215d84fe10
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-08-20 23:00:34 +02:00
J-P Nurmi
9f44b8d45b Add generated atspi2 files to .gitignore
Change-Id: I6ffa39b6a8387975defb7debbb5076581a9cb672
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-08-08 19:01:21 +02:00
Sergio Ahumada
4780e5326f Integrate gcov support into Qt build system.
To instrument a Qt application or library with the gcov coverage
tool, do `CONFIG+=gcov' in the application .pro file.

To instrument Qt itself with gcov, use the `-gcov' configure
option.

Change-Id: If24e91d95318609b0df1a76ed6d679bd92bcaab2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-08-07 13:38:07 +02:00
David Faure
12d8264a24 tst_qdbusabstractinterface: generate interface at compile time
in order to test for regressions in qdbusxml2cpp too.

Change-Id: Icd2a6f319c5fabf0b0f2a1fe8c70afcd2c84263e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
2013-05-09 12:35:39 +02:00
David Faure
1b582d64eb Long live QLockFile
Locking between processes, implemented with open(O_EXCL) on Unix
and CreateFile(CREATE_NEW) on Windows.

Supports detecting stale lock files and deleting them.
Advisory locking is used to prevent deletion of files that are still in use.

Change-Id: Id00ee2a4e77a29483d869037c7047c59cb909339
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-03-05 06:26:33 +01:00
Frederik Gladhorn
a48a85098b Add .device.vars to .gitignore.
Change-Id: Ia119a33faa6e0e84cb8a002e2ee9f9a745d31f1c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-03-01 19:43:44 +01:00
Miikka Heikkinen
2aab04866f Add qmake generated files to .gitignore.
Add source files generated by qmake for automatic static plugin
imports to .gitignore.

Change-Id: I2a2da2f8db41b41601566e66238affa3dcc66dff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-19 21:31:58 +01:00
Paul Olav Tvete
d25bd0c37e Fix docs for Drag and Drop examples
Change-Id: Ic1622b64603f7634b697bd7d8412dcc9f1a8c3fa
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-11-30 18:37:35 +01:00
J-P Nurmi
3101e48b2c Add VS manifest files to .gitignore
Change-Id: I3aea869d870bdba047b4e86d2034c25eb62075f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-11-23 17:04:00 +01:00