Liang Qi 38c1057f69 Merge remote-tracking branch 'origin/5.6' into 5.7 ... This also reverts commit 0d2f0164f4. Conflicts: header.BSD-NEW qmake/Makefile.win32 src/openglextensions/qopenglextensions.cpp src/openglextensions/qopenglextensions.h src/winmain/qtmain_win.cpp src/winmain/qtmain_winrt.cpp tools/configure/configureapp.cpp util/glgen/qopenglextensions.cpp.header util/glgen/qopenglextensions.h.header Change-Id: If26c6f4111b342378dd88bbdc657e322d2ab6ad8		2016-11-23 09:24:36 +01:00
..
qcolordialog	Updated license headers	2016-01-21 18:55:18 +00:00
qdialog	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-11 20:08:50 +01:00
qerrormessage	Updated license headers	2016-01-21 18:55:18 +00:00
qfiledialog	Fix tst_QFiledialog::widgetlessNativeDialog()	2016-09-30 08:33:39 +00:00
qfiledialog2	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-23 09:24:36 +01:00
qfilesystemmodel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00
qfontdialog	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qinputdialog	Updated license headers	2016-01-21 18:55:18 +00:00
qmessagebox	Updated license headers	2016-01-21 18:55:18 +00:00
qprogressdialog	Updated license headers	2016-01-21 18:55:18 +00:00
qsidebar	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qwizard	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-27 10:23:39 +02:00
dialogs.pro	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00