Liang Qi c2b224a758 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/io/qprocess_unix.cpp src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/util/util.pri tests/auto/corelib/thread/qthread/qthread.pro tests/auto/corelib/thread/qthread/tst_qthread.cpp Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b		2017-07-04 16:05:53 +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-19 16:12:34 +02:00
makefile.cpp	qmake: Avoid raw string comparison	2017-06-12 10:47:08 +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	Pass the absolute path with the file when finding files	2017-06-19 08:39:40 +00: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