diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-09-24 12:08:10 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-09-30 09:57:04 +0200 |
commit | 536ead429648f40b874f8d6927bb8f98e8f47a37 (patch) | |
tree | e419d5eaf01c0a363b609574261f6c3ad6a45efd /tests/auto/quick/qquickscreen | |
parent | d5b10eda96e2b00a11a2346cb2374af053a5c5af (diff) |
Add orientationUpdateMask to QQuickScreen
Task-number: QTBUG-38699
Change-Id: I173b7e53c27dba336351572859f7c9aeafe07ef9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'tests/auto/quick/qquickscreen')
-rw-r--r-- | tests/auto/quick/qquickscreen/data/screen.qml | 3 | ||||
-rw-r--r-- | tests/auto/quick/qquickscreen/tst_qquickscreen.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickscreen/data/screen.qml b/tests/auto/quick/qquickscreen/data/screen.qml index 780b22f23d..dc3803f4e3 100644 --- a/tests/auto/quick/qquickscreen/data/screen.qml +++ b/tests/auto/quick/qquickscreen/data/screen.qml @@ -8,4 +8,7 @@ Item { property int h: Window.Screen.height property int curOrientation: Window.Screen.orientation property int priOrientation: Window.Screen.primaryOrientation + property int updateMask: Window.Screen.orientationUpdateMask + + Window.Screen.orientationUpdateMask: Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation } diff --git a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp index dc6fe061c3..be543e8022 100644 --- a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp +++ b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp @@ -62,6 +62,7 @@ void tst_qquickscreen::basicProperties() QCOMPARE(screen->size().height(), root->property("h").toInt()); QCOMPARE(int(screen->orientation()), root->property("curOrientation").toInt()); QCOMPARE(int(screen->primaryOrientation()), root->property("priOrientation").toInt()); + QCOMPARE(int(screen->orientationUpdateMask()), root->property("updateMask").toInt()); } QTEST_MAIN(tst_qquickscreen) |