Liang Qi bf58c70546 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/corelib/io/qdir.cpp src/corelib/kernel/qtimer.cpp src/corelib/kernel/qtimer.h Done-With: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f		2018-11-22 01:53:29 +01:00
..
mac	qmake: make sure QMAKE_LIBS{,_PRIVATE} comes after LIBS{,_PRIVATE}	2018-10-12 18:06:33 +00:00
unix	qmake: fix .prl file generation for bundles	2018-11-07 10:32:52 +00:00
win32	Enable users to specify WindowsTargetPlatform[Min]Version in VS projects	2018-11-16 10:55:16 +00:00
makefile.cpp	qmake: fix .prl file generation for bundles	2018-11-07 10:32:52 +00:00
makefile.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +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