Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Conflicts:
      examples/quick/shared/LauncherList.qml
      src/quick/items/qquickevents.cpp
      src/quick/items/qquickevents_p_p.h
      src/quick/items/qquickwindow.cpp
      tests/auto/quick/touchmouse/tst_touchmouse.cpp

Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
index d780b91260..e428a1fc6e 100644
--- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
+++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
@@ -53,6 +53,7 @@ private slots:
     void styleHints();
     void cleanup();
     void displayName();
+    void platformName();
 
 private:
     QQmlEngine engine;
@@ -264,6 +265,24 @@ void tst_qquickapplication::displayName()
     QCOMPARE(QGuiApplication::applicationDisplayName(), name[2]);
 }
 
+void tst_qquickapplication::platformName()
+{
+    // Set up QML component
+    QQmlComponent component(&engine, testFileUrl("tst_platformname.qml"));
+    QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
+    QVERIFY(item);
+    QQuickView view;
+    item->setParentItem(view.rootObject());
+
+    // Get native platform name
+    QString guiApplicationPlatformName = QGuiApplication::platformName();
+    QVERIFY(!guiApplicationPlatformName.isEmpty());
+
+    // Get platform name from QML component and verify it's same
+    QString qmlPlatformName = qvariant_cast<QString>(item->property("platformName"));
+    QCOMPARE(qmlPlatformName, guiApplicationPlatformName);
+}
+
 QTEST_MAIN(tst_qquickapplication)
 
 #include "tst_qquickapplication.moc"