diff options
Diffstat (limited to 'tests/auto/quick')
-rw-r--r-- | tests/auto/quick/qquickmousearea/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/quick/qquickmousearea/data/rejectEvent.qml | 2 | ||||
-rw-r--r-- | tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickmousearea/BLACKLIST b/tests/auto/quick/qquickmousearea/BLACKLIST index 41608725da..7522f6f92f 100644 --- a/tests/auto/quick/qquickmousearea/BLACKLIST +++ b/tests/auto/quick/qquickmousearea/BLACKLIST @@ -12,9 +12,6 @@ opensuse-leap [nestedEventDelivery] * # QTBUG-86729 -[notPressedAfterStolenGrab] -* # QTBUG-86729 - [ignoreBySource] * # QTBUG-86729 diff --git a/tests/auto/quick/qquickmousearea/data/rejectEvent.qml b/tests/auto/quick/qquickmousearea/data/rejectEvent.qml index 816fc76fac..48b68ee845 100644 --- a/tests/auto/quick/qquickmousearea/data/rejectEvent.qml +++ b/tests/auto/quick/qquickmousearea/data/rejectEvent.qml @@ -13,6 +13,7 @@ Rectangle { MouseArea { id: mouseRegion1 + objectName: "mouseRegion1" anchors.fill: parent onPressed: { root.mr1_pressed = true } onReleased: { root.mr1_released = true } @@ -20,6 +21,7 @@ Rectangle { } MouseArea { id: mouseRegion2 + objectName: "mouseRegion2" width: 120; height: 120 onPressed: { root.mr2_pressed = true; mouse.accepted = false } onReleased: { root.mr2_released = true } diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp index 569c68447e..40d0b11a86 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -43,6 +43,8 @@ #include <QtGui/QScreen> #include <qpa/qwindowsysteminterface.h> +Q_LOGGING_CATEGORY(lcTests, "qt.quick.tests") + class CircleMask : public QObject { Q_OBJECT @@ -2228,7 +2230,7 @@ void tst_QQuickMouseArea::ignoreBySource() QCOMPARE(flickable->contentY(), 0.); } -void tst_QQuickMouseArea::notPressedAfterStolenGrab() +void tst_QQuickMouseArea::notPressedAfterStolenGrab() // QTBUG-55325 { QQuickWindow window; window.resize(200, 200); @@ -2239,7 +2241,7 @@ void tst_QQuickMouseArea::notPressedAfterStolenGrab() ma->setSize(window.size()); QObject::connect(ma, static_cast<void (QQuickMouseArea::*)(QQuickMouseEvent*)>(&QQuickMouseArea::pressed), - [&]() { window.contentItem()->grabMouse(); }); + [&]() { qCDebug(lcTests) << "stealing grab now"; window.contentItem()->grabMouse(); }); QTest::mouseClick(&window, Qt::LeftButton); QVERIFY(!ma->pressed()); |