Liang Qi 106d3b9bf9 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoamenu.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/widgets/styles/qstylehelper_p.h Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb		2017-08-15 16:31:48 +02:00
..
ioutils.cpp	Preserve last modification timestamps of installed directories	2017-05-02 10:27:15 +00:00
ioutils.h	Preserve last modification timestamps of installed directories	2017-05-02 10:27:15 +00:00
proitems.cpp	Change source identifier type in ProString	2017-08-15 10:54:50 +00:00
proitems.h	Merge remote-tracking branch 'origin/5.9' into dev	2017-08-15 16:31:48 +02:00
qmake_global.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	Merge remote-tracking branch 'origin/5.9' into dev	2017-08-15 16:31:48 +02:00
qmakeevaluator_p.h	make QMAKE_DIR_SEP magic on writing	2016-12-20 10:16:32 +00:00
qmakeevaluator.cpp	Merge remote-tracking branch 'origin/5.9' into dev	2017-08-15 16:31:48 +02:00
qmakeevaluator.h	Change source identifier type in ProString	2017-08-15 10:54:50 +00:00
qmakeglobals.cpp	add a bunch of complementary options to -after	2017-02-06 16:34:17 +00:00
qmakeglobals.h	add a bunch of complementary options to -after	2017-02-06 16:34:17 +00:00
qmakeparser.cpp	Change source identifier type in ProString	2017-08-15 10:54:50 +00:00
qmakeparser.h	Change source identifier type in ProString	2017-08-15 10:54:50 +00:00
qmakevfs.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-01 22:15:55 +02:00
qmakevfs.h	Updated license headers	2016-01-21 18:55:18 +00:00