diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-16 16:20:14 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-16 16:23:06 +0000 |
| commit | 1ec7ee5ce236048daf42107aaf86ffdd2e26f0a9 (patch) | |
| tree | 5072df4eae31cb333a10f041714c53f75a0a1def /tests/auto/quick/qquickmultipointtoucharea | |
| parent | eebe036cdf330c334330910362d84204fe8fd608 (diff) | |
tst_qquickmultipointtoucharea: Do not rely on qCompare(bool, int,...).
The overload was added for NokiaX86 and RVCT and is bound for
removal.
Task-number: QTBUG-47260
Change-Id: I4ead3b03c979a3116278d364ef85fe7d83c5f971
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/qquickmultipointtoucharea')
| -rw-r--r-- | tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp index e69ebfa8fe..a3459ca626 100644 --- a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp +++ b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp @@ -1186,14 +1186,14 @@ void tst_QQuickMultiPointTouchArea::mouseInteraction() QPoint p1 = QPoint(100, 100); QTest::mousePress(view.data(), (Qt::MouseButton) buttons, 0, p1); QCOMPARE(area->property("touchCount").toInt(), accept); - QCOMPARE(point1->pressed(), accept); + QCOMPARE(point1->pressed(), accept != 0); p1 += QPoint(10, 10); QTest::mouseMove(view.data(), p1); - QCOMPARE(point1->pressed(), accept); + QCOMPARE(point1->pressed(), accept != 0); QCOMPARE(area->property("touchCount").toInt(), accept); p1 += QPoint(10, 10); QTest::mouseMove(view.data(), p1); - QCOMPARE(point1->pressed(), accept); + QCOMPARE(point1->pressed(), accept != 0); QCOMPARE(area->property("touchCount").toInt(), accept); QTest::mouseRelease(view.data(), (Qt::MouseButton) buttons); QCOMPARE(point1->pressed(), false); |