diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ut_mapplicationmenu/ut_mapplicationmenu.cpp | 4 | ||||
-rw-r--r-- | tests/ut_mapplicationpage/ut_mapplicationpage.cpp | 4 | ||||
-rw-r--r-- | tests/ut_mdialog/ut_mdialog.cpp | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/ut_mapplicationmenu/ut_mapplicationmenu.cpp b/tests/ut_mapplicationmenu/ut_mapplicationmenu.cpp index 1b72e274..cd18f4ca 100644 --- a/tests/ut_mapplicationmenu/ut_mapplicationmenu.cpp +++ b/tests/ut_mapplicationmenu/ut_mapplicationmenu.cpp @@ -239,7 +239,7 @@ void Ut_MApplicationMenu::testClear() void Ut_MApplicationMenu::testEventsPassingThrough() { - m_subject->appear(); + m_subject->appear(appWin); // The event should be swallowed if it is not triggering any action. QGraphicsSceneMouseEvent mousePressEvent(QEvent::GraphicsSceneMousePress); QVERIFY(mousePressEvent.isAccepted()); @@ -281,7 +281,7 @@ void Ut_MApplicationMenu::testRotation() /* Rotate the scene by 90 degrees and back again. We should find that the * preferred size hasn't changed overall. We call processEvents to check that there * are no outstanding layouting etc */ - m_subject->appear(); + m_subject->appear(appWin); MApplication::activeWindow()->setOrientationAngle(M::Angle0); QSizeF preferredSizeLandscape = m_subject->preferredSize(); app->processEvents(); diff --git a/tests/ut_mapplicationpage/ut_mapplicationpage.cpp b/tests/ut_mapplicationpage/ut_mapplicationpage.cpp index 50c1f82a..d7191bb0 100644 --- a/tests/ut_mapplicationpage/ut_mapplicationpage.cpp +++ b/tests/ut_mapplicationpage/ut_mapplicationpage.cpp @@ -235,7 +235,7 @@ void Ut_MApplicationPage::testUpdatingWindowTitleWithChangingPageTitle() QString title3_longest("Multiple length variants title"); QString title4; - m_subject->appear(); + m_subject->appear(appWin); m_subject->setTitle(title); QCOMPARE(appWin->windowTitle(), title); @@ -249,7 +249,7 @@ void Ut_MApplicationPage::testUpdatingWindowTitleWithChangingPageTitle() void Ut_MApplicationPage::testIfPositionIndicatorGeometryFollowsExposedRect() { - m_subject->appear(); + m_subject->appear(appWin); QCOMPARE(m_subject->pannableViewport()->positionIndicator()->geometry(), m_subject->exposedContentRect()); } diff --git a/tests/ut_mdialog/ut_mdialog.cpp b/tests/ut_mdialog/ut_mdialog.cpp index 920f5bee..3fa4e19c 100644 --- a/tests/ut_mdialog/ut_mdialog.cpp +++ b/tests/ut_mdialog/ut_mdialog.cpp @@ -321,14 +321,14 @@ void Ut_MDialog::dismissDialog() void Ut_MDialog::testRotation() { - dialog->appear(); - MApplication::activeWindow()->setOrientationAngle(M::Angle0); + dialog->appear(appWin); + appWin->setOrientationAngle(M::Angle0); QSizeF preferredSizeLandscape = dialog->preferredSize(); - MApplication::activeWindow()->setOrientationAngle(M::Angle90); + appWin->setOrientationAngle(M::Angle90); QSizeF preferredSizePortrait = dialog->preferredSize(); - MApplication::activeWindow()->setOrientationAngle(M::Angle0); + appWin->setOrientationAngle(M::Angle0); QCOMPARE(dialog->preferredSize(), preferredSizeLandscape); - MApplication::activeWindow()->setOrientationAngle(M::Angle90); + appWin->setOrientationAngle(M::Angle90); QCOMPARE(dialog->preferredSize(), preferredSizePortrait); } |