Liang Qi b131503361 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: configure configure.pri examples/widgets/painting/fontsampler/mainwindow.cpp examples/widgets/painting/fontsampler/mainwindow.h mkspecs/features/moc.prf src/corelib/global/qglobal.h src/gui/text/qtextdocument.cpp Change-Id: Ica65512e00871695190a14ccea5c275b0165f787		2016-12-16 16:38:33 +01:00
..
mac	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
unix	Merge remote-tracking branch 'origin/5.8' into dev	2016-09-15 19:47:57 +02:00
win32	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-16 16:38:33 +01:00
makefile.cpp	qmake: fix execution of depend_command in directories with funny names	2016-11-30 17:05:01 +00:00
makefile.h	qmake: Mark MakefileGenerator::Compiler as Q_MOVABLE_TYPE	2016-08-15 22:16:59 +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	Fix typo in autogenerated *.pro file comment	2016-12-13 15:05:22 +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