diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-03-03 07:53:30 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-08 02:49:27 +0000 |
| commit | 16598b87c65c7de25aa2863ebe6a0e86d66b6147 (patch) | |
| tree | 5ec47bb29402fe773cabef930cb1f021d0682a05 /src | |
| parent | a26a2fb65378ec68360fab7097abfff92ac8c45d (diff) | |
qtestmouse.h: compile with QT_TYPESAFE_FLAGS
Also include the comprehensive tests for bool cast compilation which I
originally wrote to confirm that the QTEST_ASSERT() change should be™
correct.
Task-number: QTBUG-101406
Change-Id: I9a2871bfd4be9999b7a720bec775bba7aeffbe24
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
(cherry picked from commit 53890b5d3cd771d66d6b73940eb38e3c3fc6d60f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/testlib/qtestmouse.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index 26d3b50145..62a9b5d9bf 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -114,9 +114,9 @@ namespace QTest if (pos.isNull()) pos = QPoint(window->width() / 2, window->height() / 2); - QTEST_ASSERT(uint(stateKey) == 0 || stateKey & Qt::KeyboardModifierMask); + QTEST_ASSERT(!stateKey || stateKey & Qt::KeyboardModifierMask); - stateKey &= static_cast<unsigned int>(Qt::KeyboardModifierMask); + stateKey &= Qt::KeyboardModifierMask; QPointF global = window->mapToGlobal(pos); QPointer<QWindow> w(window); @@ -201,9 +201,9 @@ namespace QTest return; } - QTEST_ASSERT(stateKey == 0 || stateKey & Qt::KeyboardModifierMask); + QTEST_ASSERT(!stateKey || stateKey & Qt::KeyboardModifierMask); - stateKey &= static_cast<unsigned int>(Qt::KeyboardModifierMask); + stateKey &= Qt::KeyboardModifierMask; QEvent::Type meType; using namespace QTestPrivate; |