Liang Qi 1fadc7292b Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/plugins/platforms/windows/qwindowsfontengine.cpp src/plugins/platforms/windows/qwindowsnativeimage.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I649b32b260ce0ed2d6a5089021daa0d6a8db85f7		2016-02-24 13:31:14 +01:00
..
qcolordialog	Updated license headers	2016-01-21 18:55:18 +00:00
qdialog	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
qerrormessage	Updated license headers	2016-01-21 18:55:18 +00:00
qfiledialog	Updated license headers	2016-01-21 18:55:18 +00:00
qfiledialog2	Updated license headers	2016-01-21 18:55:18 +00:00
qfilesystemmodel	Updated license headers	2016-01-21 18:55:18 +00:00
qfontdialog	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-24 13:31:14 +01: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	Updated license headers	2016-01-21 18:55:18 +00:00
qwizard	Updated license headers	2016-01-21 18:55:18 +00:00
dialogs.pro	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00