aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2012-01-24 10:04:45 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-24 21:01:53 +0100
commitd2d53dffbc3ba52333e559e2c0391bd73e5b840c (patch)
treef156da156fe9d715e58ac5d8cc5e5cecfbb46a0a /tests/auto
parent40bbc9503b988412202836bc4d10a0a9f645a940 (diff)
Adapted QQuickScreenAttached to orientation API changes in QScreen.
Change-Id: Ic2cb008b989780e297f03ddd5bdef466bb230c74 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qtquick2/qquickscreen/data/screen.qml2
-rw-r--r--tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qtquick2/qquickscreen/data/screen.qml b/tests/auto/qtquick2/qquickscreen/data/screen.qml
index 971975f892..780b22f23d 100644
--- a/tests/auto/qtquick2/qquickscreen/data/screen.qml
+++ b/tests/auto/qtquick2/qquickscreen/data/screen.qml
@@ -6,6 +6,6 @@ Item {
height: 100
property int w: Window.Screen.width
property int h: Window.Screen.height
- property int curOrientation: Window.Screen.currentOrientation
+ property int curOrientation: Window.Screen.orientation
property int priOrientation: Window.Screen.primaryOrientation
}
diff --git a/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp b/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp
index 8e3228475d..fdb27302ae 100644
--- a/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp
+++ b/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp
@@ -68,7 +68,7 @@ void tst_qquickscreen::basicProperties()
QCOMPARE(screen->size().width(), root->property("w").toInt());
QCOMPARE(screen->size().height(), root->property("h").toInt());
- QCOMPARE(int(screen->currentOrientation()), root->property("curOrientation").toInt());
+ QCOMPARE(int(screen->orientation()), root->property("curOrientation").toInt());
QCOMPARE(int(screen->primaryOrientation()), root->property("priOrientation").toInt());
}