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
..
configure_pch.h	Updated license headers	2016-01-21 18:55:18 +00:00
configure.pro	move license check to qmake-based configure system	2016-12-08 12:40:53 +00:00
configureapp.cpp	move all target spec handling to qmake-based configure system	2016-12-13 18:56:34 +00:00
configureapp.h	move qdevice.pri creation to qmake-based configure system	2016-12-13 18:56:28 +00:00
environment.cpp	move license check to qmake-based configure system	2016-12-08 12:40:53 +00:00
environment.h	move license check to qmake-based configure system	2016-12-08 12:40:53 +00:00
main.cpp	move qdevice.pri creation to qmake-based configure system	2016-12-13 18:56:28 +00:00
Makefile.mingw	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-13 09:39:20 +01:00
Makefile.win32	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-13 09:39:20 +01:00