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
..
qmake.conf	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-16 16:38:33 +01:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00