AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a065eb5c47
qt5base-lts/qmake
History
Liang Qi 6b2535ea15 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
2020-02-13 18:31:40 +01:00
..
doc Doc: Document the ltcg CONFIG value 2020-02-10 15:09:20 +01:00
generators Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
library Use a QMap instead of a QHash for the ProValueMap 2020-02-03 17:43:30 +01:00
.prev_CMakeLists.txt Post Merge Fixes 2020-01-24 12:29:18 +00:00
cachekeys.h
CMakeLists.txt Post Merge Fixes 2020-01-24 12:29:18 +00:00
main.cpp Merge remote-tracking branch 'origin/dev' into merge-dev 2020-01-24 13:17:33 +01:00
Makefile.unix Merge remote-tracking branch 'origin/5.15' into dev 2020-01-04 15:32:34 +01:00
Makefile.unix.macos Merge remote-tracking branch 'origin/5.8' into dev 2016-12-13 09:39:20 +01:00
Makefile.unix.mingw fix "make clean" of qmake in a builddir with spaces on mingw 2017-12-14 18:06:31 +00:00
Makefile.unix.unix Move the readlink(2) wrapper to qcore_unix.cpp 2017-07-08 02:18:16 +00:00
Makefile.unix.win32 qmake: add $$read_registry() function 2019-01-05 20:33:07 +00:00
Makefile.win32 Use C++17 for qmake and force the build of everything with C++17 2020-02-08 09:49:07 +01:00
meta.cpp qmake: Remove dead code 2019-04-05 07:48:34 +00:00
meta.h qmake: Remove dead code 2019-04-05 07:48:34 +00:00
option.cpp Make Qt relocatable 2019-09-07 20:02:45 +02:00
option.h Remove QMake's -createstub option 2019-08-03 14:48:10 +02:00
project.cpp qmake: use std names on a linked list 2019-05-13 16:39:22 +00:00
project.h qmake: use std names on a linked list 2019-05-13 16:39:22 +00:00
property.cpp Remove leftovers from QML1 2019-10-10 11:28:19 +02:00
property.h move generation of qconfig.cpp (and qt.conf) to qmake-based configure 2016-12-13 18:56:12 +00:00
qmake_pch.h qmake: move QT_BEGIN_NAMESPACE to correct place 2018-12-19 19:21:35 +00:00
qmake-aux.pro revert to building qmake with qconfig.cpp 2017-01-06 20:09:08 +00:00
qmake.pro Split cborstream feature in two 2019-12-12 10:42:27 +01:00