Liang Qi 980567b3a3 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/android/templates/AndroidManifest.xml tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9		2019-01-26 08:35:40 +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 dev	2019-01-26 08:35:40 +01:00
makefile.cpp	Merge remote-tracking branch 'origin/5.12' into dev	2019-01-26 08:35:40 +01:00
makefile.h	Resolve macOS framework headers for extra compiler depend_command	2019-01-15 12:43:12 +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	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +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