4 files changed, 81 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickscreen/data/screen.qml b/tests/auto/quick/qquickscreen/data/screen.qml
index c246b3cd83..cf60d0ae40 100644
--- a/tests/auto/quick/qquickscreen/data/screen.qml
+++ b/tests/auto/quick/qquickscreen/data/screen.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Window 2.0 as Window
+import QtQuick.Window 2.3 as Window
 
 Item {
     width: 100
@@ -10,6 +10,18 @@ Item {
     property int priOrientation: Window.Screen.primaryOrientation
     property int updateMask: Window.Screen.orientationUpdateMask
     property real devicePixelRatio: Window.Screen.devicePixelRatio
+    property int vx: Window.Screen.virtualX
+    property int vy: Window.Screen.virtualY
 
     Window.Screen.orientationUpdateMask: Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation
+
+    property int screenCount: Qt.application.screens.length
+
+    property variant allScreens
+    Component.onCompleted: {
+        allScreens = [];
+        var s = Qt.application.screens;
+        for (var i = 0; i < s.length; ++i)
+            allScreens.push(s[i]);
+    }
 }
diff --git a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
index 92afdf6864..26b687a4a6 100644
--- a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
+++ b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
@@ -33,13 +33,15 @@
 #include <QtQuick/QQuickView>
 #include <QtGui/QScreen>
 #include "../../shared/util.h"
-
+#include <QtQuick/private/qquickscreen_p.h>
+#include <QDebug>
 class tst_qquickscreen : public QQmlDataTest
 {
     Q_OBJECT
 private slots:
     void basicProperties();
     void screenOnStartup();
+    void fullScreenList();
 };
 
 void tst_qquickscreen::basicProperties()
@@ -62,6 +64,10 @@ void tst_qquickscreen::basicProperties()
     QCOMPARE(int(screen->orientationUpdateMask()), root->property("updateMask").toInt());
     QCOMPARE(screen->devicePixelRatio(), root->property("devicePixelRatio").toReal());
     QVERIFY(screen->devicePixelRatio() >= 1.0);
+    QCOMPARE(screen->geometry().x(), root->property("vx").toInt());
+    QCOMPARE(screen->geometry().y(), root->property("vy").toInt());
+
+    QVERIFY(root->property("screenCount").toInt() == QGuiApplication::screens().count());
 }
 
 void tst_qquickscreen::screenOnStartup()
@@ -83,6 +89,38 @@ void tst_qquickscreen::screenOnStartup()
     QCOMPARE(int(screen->orientationUpdateMask()), root->property("updateMask").toInt());
     QCOMPARE(screen->devicePixelRatio(), root->property("devicePixelRatio").toReal());
     QVERIFY(screen->devicePixelRatio() >= 1.0);
+    QCOMPARE(screen->geometry().x(), root->property("vx").toInt());
+    QCOMPARE(screen->geometry().y(), root->property("vy").toInt());
+}
+
+void tst_qquickscreen::fullScreenList()
+{
+    QQuickView view;
+    view.setSource(testFileUrl("screen.qml"));
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+
+    QQuickItem* root = view.rootObject();
+    QVERIFY(root);
+
+    QJSValue screensArray = root->property("allScreens").value<QJSValue>();
+    QVERIFY(screensArray.isArray());
+    int length = screensArray.property("length").toInt();
+    const QList<QScreen *> screenList = QGuiApplication::screens();
+    QVERIFY(length == screenList.count());
+
+    for (int i = 0; i < length; ++i) {
+        QQuickScreenInfo *info = qobject_cast<QQuickScreenInfo *>(screensArray.property(i).toQObject());
+        QVERIFY(info != nullptr);
+        QCOMPARE(screenList[i]->name(), info->name());
+        QCOMPARE(screenList[i]->size().width(), info->width());
+        QCOMPARE(screenList[i]->size().height(), info->height());
+        QCOMPARE(screenList[i]->availableVirtualGeometry().width(), info->desktopAvailableWidth());
+        QCOMPARE(screenList[i]->availableVirtualGeometry().height(), info->desktopAvailableHeight());
+        QCOMPARE(screenList[i]->devicePixelRatio(), info->devicePixelRatio());
+        QCOMPARE(screenList[i]->geometry().x(), info->virtualX());
+        QCOMPARE(screenList[i]->geometry().y(), info->virtualY());
+    }
 }
 
 QTEST_MAIN(tst_qquickscreen)
diff --git a/tests/auto/quick/qquickwindow/data/windowWithScreen.qml b/tests/auto/quick/qquickwindow/data/windowWithScreen.qml
new file mode 100644
index 0000000000..fdc0be3388
--- /dev/null
+++ b/tests/auto/quick/qquickwindow/data/windowWithScreen.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+import QtQuick.Window 2.3 as Window
+
+Window.Window {
+    color: "#00FF00"
+    targetScreen: Qt.application.screens[0]
+    Item {
+        objectName: "item"
+    }
+}
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index acccac8eca..bfffa6f7f5 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -311,6 +311,7 @@ private slots:
     void clearWindow();
 
     void qmlCreation();
+    void qmlCreationWithScreen();
     void clearColor();
     void defaultState();
 
@@ -1122,6 +1123,24 @@ void tst_qquickwindow::qmlCreation()
     QCOMPARE(item->window(), window);
 }
 
+void tst_qquickwindow::qmlCreationWithScreen()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.loadUrl(testFileUrl("windowWithScreen.qml"));
+    QObject *created = component.create();
+    QScopedPointer<QObject> cleanup(created);
+    QVERIFY(created);
+
+    QQuickWindow *window = qobject_cast<QQuickWindow*>(created);
+    QVERIFY(window);
+    QCOMPARE(window->color(), QColor(Qt::green));
+
+    QQuickItem *item = window->findChild<QQuickItem*>("item");
+    QVERIFY(item);
+    QCOMPARE(item->window(), window);
+}
+
 void tst_qquickwindow::clearColor()
 {
     //::grab examines rendering to make sure it works visually