Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	.qmake.conf
	src/corelib/kernel/qeventdispatcher_cf.mm
	src/gui/kernel/qguiapplication_p.h
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/qioseventdispatcher.mm
	src/plugins/platforms/windows/qwindowsdrag.h
	src/plugins/platforms/windows/qwindowsinternalmimedata.h
	src/plugins/platforms/windows/qwindowsmime.cpp
	src/plugins/platforms/winrt/qwinrtscreen.cpp

Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246

3 files changed, 39 insertions, 4 deletions

diff --git a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
index b7d57dea55..a45539a041 100644
--- a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
@@ -256,7 +256,7 @@ void tst_QStandardItem::getSetFlags()
     item.setAutoTristate(true);
     QVERIFY(item.isAutoTristate());
     QVERIFY(item.flags() & Qt::ItemIsAutoTristate);
-#ifndef QT_NO_DRAGANDDROP
+#if QT_CONFIG(draganddrop)
     item.setDragEnabled(true);
     QVERIFY(item.isDragEnabled());
     QVERIFY(item.flags() & Qt::ItemIsDragEnabled);
@@ -287,7 +287,7 @@ void tst_QStandardItem::getSetFlags()
     item.setAutoTristate(false);
     QVERIFY(!item.isAutoTristate());
     QVERIFY(!(item.flags() & Qt::ItemIsAutoTristate));
-#ifndef QT_NO_DRAGANDDROP
+#if QT_CONFIG(draganddrop)
     QVERIFY(item.isDragEnabled());
     item.setDragEnabled(false);
     QVERIFY(!item.isDragEnabled());
diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 1ecfdb5e47..9399ebce34 100644
--- a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -1426,7 +1426,7 @@ void tst_QStandardItemModel::rootItemFlags()
     QCOMPARE(model.invisibleRootItem()->flags() , f);
     QCOMPARE(model.invisibleRootItem()->flags() , model.flags(QModelIndex()));
 
-#ifndef QT_NO_DRAGANDDROP
+#if QT_CONFIG(draganddrop)
     model.invisibleRootItem()->setDropEnabled(false);
 #endif
     QCOMPARE(model.invisibleRootItem()->flags() , Qt::ItemIsEnabled);
@@ -1560,7 +1560,7 @@ void tst_QStandardItemModel::treeDragAndDrop()
     view.setModel(&model);
     view.expandAll();
     view.show();
-#ifndef QT_NO_DRAGANDDROP
+#if QT_CONFIG(draganddrop)
     view.setDragDropMode(QAbstractItemView::InternalMove);
 #endif
     view.setSelectionMode(QAbstractItemView::ExtendedSelection);
diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
index 0a6a95daca..f9366c9227 100644
--- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
+++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
@@ -49,6 +49,8 @@ private slots:
     void matrix();
     void testOffset();
     void types();
+    void types2_data();
+    void types2();
     void scalarOps();
     void transform();
     void mapEmptyPath();
@@ -65,6 +67,7 @@ private:
 };
 
 Q_DECLARE_METATYPE(QTransform)
+Q_DECLARE_METATYPE(QTransform::TransformationType)
 
 void tst_QTransform::mapRect_data()
 {
@@ -568,6 +571,38 @@ void tst_QTransform::types()
     QCOMPARE(m5.type(), QTransform::TxScale);
 }
 
+void tst_QTransform::types2_data()
+{
+    QTest::addColumn<QTransform>("t1");
+    QTest::addColumn<QTransform::TransformationType>("type");
+
+    QTest::newRow( "identity" ) << QTransform() << QTransform::TxNone;
+    QTest::newRow( "translate" ) << QTransform().translate(10, -0.1) << QTransform::TxTranslate;
+    QTest::newRow( "scale" ) << QTransform().scale(10, -0.1) << QTransform::TxScale;
+    QTest::newRow( "rotate" ) << QTransform().rotate(10) << QTransform::TxRotate;
+    QTest::newRow( "shear" ) << QTransform().shear(10, -0.1) << QTransform::TxShear;
+    QTest::newRow( "project" ) << QTransform().rotate(10, Qt::XAxis) << QTransform::TxProject;
+    QTest::newRow( "combined" ) << QTransform().translate(10, -0.1).scale(10, -0.1).rotate(10, Qt::YAxis) << QTransform::TxProject;
+}
+
+void tst_QTransform::types2()
+{
+#define CHECKTXTYPE(func) { QTransform t2(func); \
+                            QTransform t3(t2.m11(), t2.m12(), t2.m13(), t2.m21(), t2.m22(), t2.m23(), t2.m31(), t2.m32(), t2.m33()); \
+                            QVERIFY2(t3.type() == t2.type(), #func); \
+                          }
+
+    QFETCH( QTransform, t1 );
+    QFETCH( QTransform::TransformationType, type );
+
+    Q_ASSERT(t1.type() == type);
+
+    CHECKTXTYPE(t1.adjoint());
+    CHECKTXTYPE(t1.inverted());
+    CHECKTXTYPE(t1.transposed());
+
+#undef CHECKTXTYPE
+}
 
 void tst_QTransform::scalarOps()
 {