Liang Qi 9967a011ea Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: qmake/generators/makefile.cpp src/plugins/platforms/cocoa/qcocoaintegration.h src/plugins/platforms/cocoa/qcocoaintegration.mm Done-With: Jörg Bornemann <joerg.bornemann@qt.io> Change-Id: I5a61e161784cc6f947abe370aab8f2971a9cbe78		2019-06-07 13:19:27 +02:00
..
mac	qmake: Cleanup	2019-06-05 10:59:43 +02:00
unix	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-07 13:19:27 +02:00
win32	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-07 13:19:27 +02:00
makefile.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-07 13:19:27 +02:00
makefile.h	Make the Makefile a dependency of default targets for nmake	2019-02-04 08:10:25 +00:00
makefiledeps.cpp	qmake: Cleanup	2019-06-05 10:59:43 +02: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: Cleanup	2019-06-05 10:59:43 +02: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