From 3e12951c0b35041920989d6089ddb6c2f5c2d3d1 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 24 Mar 2020 13:15:54 +0000 Subject: Remove QScreen::orientationUpdateMask It simplifies the API and reduces surprise to have rotation working by default. On Android, the manifest specifies which orientations the application has been designed to support; on iOS, it is controlled via the UISupportedInterfaceOrientations property list key. In addition, QWindow::contentOrientation() is another way to give a hint to the window manager, or on iOS to directly control whether the window's rotation is locked or not. Task-number: QTBUG-35427 Task-number: QTBUG-38576 Task-number: QTBUG-44569 Task-number: QTBUG-51012 Task-number: QTBUG-83055 Change-Id: Ieed818497f686399db23813269af322bfdd237af Reviewed-by: Richard Moe Gustavsen --- tests/auto/gui/kernel/qscreen/tst_qscreen.cpp | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'tests/auto/gui/kernel/qscreen/tst_qscreen.cpp') diff --git a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp index c01ebabcf8..9f2a767d60 100644 --- a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp +++ b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp @@ -168,38 +168,33 @@ void tst_QScreen::orientationChange() qRegisterMetaType("Qt::ScreenOrientation"); QScreen *screen = QGuiApplication::primaryScreen(); - - screen->setOrientationUpdateMask(Qt::LandscapeOrientation | Qt::PortraitOrientation); + QSignalSpy spy(screen, SIGNAL(orientationChanged(Qt::ScreenOrientation))); + int expectedSignalCount = 0; QWindowSystemInterface::handleScreenOrientationChange(screen, Qt::LandscapeOrientation); QWindowSystemInterface::flushWindowSystemEvents(); QTRY_COMPARE(screen->orientation(), Qt::LandscapeOrientation); + QCOMPARE(spy.count(), ++expectedSignalCount); QWindowSystemInterface::handleScreenOrientationChange(screen, Qt::PortraitOrientation); QWindowSystemInterface::flushWindowSystemEvents(); QTRY_COMPARE(screen->orientation(), Qt::PortraitOrientation); - - QSignalSpy spy(screen, SIGNAL(orientationChanged(Qt::ScreenOrientation))); + QCOMPARE(spy.count(), ++expectedSignalCount); QWindowSystemInterface::handleScreenOrientationChange(screen, Qt::InvertedLandscapeOrientation); QWindowSystemInterface::flushWindowSystemEvents(); + QTRY_COMPARE(screen->orientation(), Qt::InvertedLandscapeOrientation); + QCOMPARE(spy.count(), ++expectedSignalCount); + QWindowSystemInterface::handleScreenOrientationChange(screen, Qt::InvertedPortraitOrientation); QWindowSystemInterface::flushWindowSystemEvents(); - QWindowSystemInterface::handleScreenOrientationChange(screen, Qt::LandscapeOrientation); - QWindowSystemInterface::flushWindowSystemEvents(); - - QTRY_COMPARE(screen->orientation(), Qt::LandscapeOrientation); - QCOMPARE(spy.count(), 1); + QTRY_COMPARE(screen->orientation(), Qt::InvertedPortraitOrientation); + QCOMPARE(spy.count(), ++expectedSignalCount); - spy.clear(); - QWindowSystemInterface::handleScreenOrientationChange(screen, Qt::InvertedLandscapeOrientation); + QWindowSystemInterface::handleScreenOrientationChange(screen, Qt::LandscapeOrientation); QWindowSystemInterface::flushWindowSystemEvents(); QTRY_COMPARE(screen->orientation(), Qt::LandscapeOrientation); - QCOMPARE(spy.count(), 0); - - screen->setOrientationUpdateMask(screen->orientationUpdateMask() | Qt::InvertedLandscapeOrientation); - QTRY_COMPARE(screen->orientation(), Qt::InvertedLandscapeOrientation); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.count(), ++expectedSignalCount); } #include -- cgit v1.2.3