diff options
-rw-r--r-- | tests/auto/quick/qquickmousearea/data/pressedCanceled.qml | 7 | ||||
-rw-r--r-- | tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/tests/auto/quick/qquickmousearea/data/pressedCanceled.qml b/tests/auto/quick/qquickmousearea/data/pressedCanceled.qml index 9079cbdfce..c1c4b039a6 100644 --- a/tests/auto/quick/qquickmousearea/data/pressedCanceled.qml +++ b/tests/auto/quick/qquickmousearea/data/pressedCanceled.qml @@ -1,5 +1,4 @@ import QtQuick 2.0 -import QtQuick.Window 2.0 Rectangle { id: root @@ -10,12 +9,6 @@ Rectangle { property int clicked: 0 property int doubleClicked: 0 property int released: 0 - property alias secondWindow: secondWindow - - Window { - id: secondWindow - x: root.x + root.width - } MouseArea { id: mouse diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp index 9691e1fd80..569c68447e 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -937,7 +937,6 @@ void tst_QQuickMouseArea::pressedCanceledOnWindowDeactivate() QCOMPARE(window.rootObject()->property("released").toInt(), expectedRelease); QCOMPARE(window.rootObject()->property("clicked").toInt(), expectedClicks); - QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {}); QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {}); @@ -966,11 +965,8 @@ void tst_QQuickMouseArea::pressedCanceledOnWindowDeactivate() QCOMPARE(window.rootObject()->property("doubleClicked").toInt(), 1); } - - QWindow *secondWindow = qvariant_cast<QWindow*>(window.rootObject()->property("secondWindow")); - secondWindow->setProperty("visible", true); - QVERIFY(QTest::qWaitForWindowExposed(secondWindow)); - + QEvent windowDeactivateEvent(QEvent::WindowDeactivate); + QGuiApplication::sendEvent(&window, &windowDeactivateEvent); QTRY_VERIFY(!window.rootObject()->property("pressed").toBool()); QVERIFY(window.rootObject()->property("canceled").toBool()); QCOMPARE(window.rootObject()->property("released").toInt(), expectedRelease); |