Liang Qi 7cbee56296 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/widgets/widgets/qmenu.cpp Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308		2017-06-07 14:02:43 +02:00
..
mac	Add QMake variables for development team and provisioning profile	2017-03-13 06:42:15 +00:00
unix	make mkspecs not mess up -rpath-link	2017-05-31 12:57:14 +00:00
win32	Merge remote-tracking branch 'origin/5.9' into dev	2017-06-07 14:02:43 +02:00
makefile.cpp	Simplify built-in qmake install command	2017-05-04 09:40:48 +00:00
makefile.h	don't pass qmake configure arguments to sub-projects	2017-01-06 20:09:18 +00:00
makefiledeps.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
makefiledeps.h	qmake: replace a uint:1 with a bool	2016-08-15 22:16:09 +00:00
metamakefile.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00
metamakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00
projectgenerator.cpp	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-02-08 15:49:18 +01:00
projectgenerator.h	Updated license headers	2016-01-21 18:55:18 +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