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
..
fontsampler.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
main.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
mainwindow.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-16 16:38:33 +01:00
mainwindow.h	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-16 16:38:33 +01:00
mainwindowbase.ui	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00