Liang Qi af0d0b9c06 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/ios/ios.pro src/plugins/platforms/ios/kernel.pro src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h src/plugins/platforms/ios/qiosintegration.h src/widgets/widgets/qcombobox.cpp tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp Change-Id: Ibaee7cbbba99e7c4b1d8926e55932ffa6030ce45		2016-10-27 10:23:39 +02: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	Auto tests: use Qt::AA_DontUseNativeDialogs where appropriate	2016-08-17 15:46:27 +00:00
qfilesystemmodel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-10 23:27:10 +02: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	…