AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3fe9f245e8
qt5base-lts/qmake/generators
History
Liang Qi fbfacd33be Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	src/android/templates/AndroidManifest.xml
	src/network/ssl/qsslsocket_mac.cpp
	src/widgets/styles/qstylesheetstyle.cpp
	tests/auto/corelib/kernel/qtimer/BLACKLIST
	tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
	tests/auto/testlib/selftests/expected_blacklisted.lightxml
	tests/auto/testlib/selftests/expected_blacklisted.tap
	tests/auto/testlib/selftests/expected_blacklisted.teamcity
	tests/auto/testlib/selftests/expected_blacklisted.txt
	tests/auto/testlib/selftests/expected_blacklisted.xml
	tests/auto/testlib/selftests/expected_blacklisted.xunitxml
	tests/auto/testlib/selftests/expected_float.tap
	tests/auto/testlib/selftests/expected_float.teamcity
	tests/auto/testlib/selftests/expected_float.txt
	tests/auto/testlib/selftests/expected_float.xunitxml

Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: If93cc432a56ae3ac1b6533d0028e4dc497415a52
2019-02-08 12:31:02 +01:00
..
mac qmake: make sure QMAKE_LIBS{,_PRIVATE} comes after LIBS{,_PRIVATE} 2018-10-12 18:06:33 +00:00
unix Merge remote-tracking branch 'origin/5.12' into dev 2019-01-07 01:00:08 +01:00
win32 Merge remote-tracking branch 'origin/5.12' into 5.13 2019-02-08 12:31:02 +01:00
makefile.cpp Merge remote-tracking branch 'origin/5.12' into 5.13 2019-02-08 12:31:02 +01:00
makefile.h Make the Makefile a dependency of default targets for nmake 2019-02-04 08:10:25 +00:00
makefiledeps.cpp qmake: Apply modernize-use-nullptr 2018-08-08 17:30:32 +00:00
makefiledeps.h qmake: replace a uint:1 with a bool 2016-08-15 22:16:09 +00:00
metamakefile.cpp qmake: Apply modernize-use-nullptr 2018-08-08 17:30:32 +00:00
metamakefile.h qmake: Apply modernize-use-nullptr 2018-08-08 17:30:32 +00:00
projectgenerator.cpp Enable deprecation warnings by default 2019-02-02 02:31:05 +00:00
projectgenerator.h qmake: Apply modernize-use-override 2018-08-08 17:30:23 +00:00
xmloutput.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-02-11 08:25:04 +01:00
xmloutput.h Updated license headers 2016-01-21 18:55:18 +00:00