diff options
author | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-04-20 13:32:03 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-20 11:51:56 +0000 |
commit | 9c8dab537819f0d999e680490c2d125b8836cbbb (patch) | |
tree | 47167adea4d8fbe9e4ac193413e315dd621aaf8f /tests | |
parent | d50a57f408a9cc160c187c012f51b8fa89738858 (diff) |
Revert "Fixed MouseArea threshold with preventStealing"
This reverts commit e1400b5b4d8311769ad3b9f631479ee2b0271197,
which breaks qtlocation unit tests for drag support.
It is no longer possible to drag markers in mapviewer.
Task-number: QTBUG-52534
Change-Id: If713a8e45f64ea898f38fe3e39561ebc266403b2
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp index 9cdfd21f9c..82c053d76a 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -79,7 +79,6 @@ private slots: void dragging_data() { acceptedButton_data(); } void dragging(); void dragSmoothed(); - void dragThreshold_data(); void dragThreshold(); void invalidDrag_data() { rejectedButton_data(); } void invalidDrag(); @@ -376,17 +375,8 @@ void tst_QQuickMouseArea::dragSmoothed() QTest::mouseRelease(&window, Qt::LeftButton, 0, QPoint(100, 122)); } -void tst_QQuickMouseArea::dragThreshold_data() -{ - QTest::addColumn<bool>("preventStealing"); - QTest::newRow("without preventStealing") << false; - QTest::newRow("with preventStealing") << true; -} - void tst_QQuickMouseArea::dragThreshold() { - QFETCH(bool, preventStealing); - QQuickView window; QByteArray errorMessage; QVERIFY2(initView(window, testFileUrl("dragging.qml"), true, &errorMessage), errorMessage.constData()); @@ -396,7 +386,6 @@ void tst_QQuickMouseArea::dragThreshold() QVERIFY(window.rootObject() != 0); QQuickMouseArea *mouseRegion = window.rootObject()->findChild<QQuickMouseArea*>("mouseregion"); - mouseRegion->setPreventStealing(preventStealing); QQuickDrag *drag = mouseRegion->drag(); drag->setThreshold(5); |