diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-17 22:10:44 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-18 10:51:40 +0000 |
| commit | 902227b8b81aa1897c1a30dfd4955a7e399ffaec (patch) | |
| tree | 75851f86ea69ac0302eedffa7bc9562e4bf9d029 /tests | |
| parent | 27f3dc012e0e32fb32a7de84efa0514f4f0fb959 (diff) | |
Use logical OR to test bools
Change-Id: I021c3354932584cb976d3529ff47f7a826731336
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit 955181ebc554240cd8fa792a125369aeb56a2eb0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index b7a1848949..57c9dda230 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -2124,7 +2124,7 @@ void tst_qquickflickable::nestedSliderUsingTouch() QTest::touchEvent(window, touchDevice).move(0, p0, window); QQuickTouchUtils::flush(window); } - QCOMPARE(tda->active(), keepMouseGrab | keepTouchGrab); + QCOMPARE(tda->active(), keepMouseGrab || keepTouchGrab); QTest::touchEvent(window, touchDevice).release(0, p0, window); QQuickTouchUtils::flush(window); QTRY_COMPARE(tda->touchPointStates.first(), QEventPoint::State::Pressed); |