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
..
mingw_make.cpp	unbreak "aux" template for mingw & msvc, take 3	2016-12-07 06:54:04 +00:00
mingw_make.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
msbuild_objectmodel.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00
msbuild_objectmodel.h	Remove superfluous includes from VS generator	2016-11-10 13:09:51 +00:00
msvc_nmake.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8.0	2016-12-08 08:20:36 +01:00
msvc_nmake.h	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_objectmodel.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-16 16:38:33 +01:00
msvc_objectmodel.h	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-13 09:39:20 +01:00
msvc_vcproj.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-16 16:38:33 +01:00
msvc_vcproj.h	Fix circular dependencies in generated vcxproj files	2016-12-01 05:07:08 +00:00
msvc_vcxproj.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.h	Updated license headers	2016-01-21 18:55:18 +00:00
winmakefile.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8.0	2016-12-08 08:20:36 +01:00
winmakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00