diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-25 00:19:42 +0000 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-05-08 11:08:40 +0100 |
| commit | b97a2de222c8d51430b3e9281ff181361cb7ea14 (patch) | |
| tree | facb34889a24c1a133185c2ba469b36540b14b0d /tests/auto/quick/qquickscreen | |
| parent | 1fc230c774ff599d14a40682c74f09118db04b2f (diff) | |
Remove Screen.orientationUpdateMask
Now Screen.orientation works by default rather than filtering by default.
Task-number: QTBUG-83055
Change-Id: I0f49499ec25ceeebf19bc8ef1adc259023f1bc75
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
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 | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickscreen/data/screen.qml b/tests/auto/quick/qquickscreen/data/screen.qml index cf60d0ae40..5ae008df17 100644 --- a/tests/auto/quick/qquickscreen/data/screen.qml +++ b/tests/auto/quick/qquickscreen/data/screen.qml @@ -8,13 +8,10 @@ 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 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 diff --git a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp index 0a3796402a..ff6031619c 100644 --- a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp +++ b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp @@ -61,7 +61,6 @@ 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()); QCOMPARE(screen->devicePixelRatio(), root->property("devicePixelRatio").toReal()); QVERIFY(screen->devicePixelRatio() >= 1.0); QCOMPARE(screen->geometry().x(), root->property("vx").toInt()); @@ -86,7 +85,6 @@ void tst_qquickscreen::screenOnStartup() 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()); QCOMPARE(screen->devicePixelRatio(), root->property("devicePixelRatio").toReal()); QVERIFY(screen->devicePixelRatio() >= 1.0); QCOMPARE(screen->geometry().x(), root->property("vx").toInt()); |