diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 14:06:47 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-15 15:53:16 +0000 |
| commit | f98d125b2928d0784d509c8025271fca661ea270 (patch) | |
| tree | 214aa16bf1782a8819b1d7fd801ab9c62af4cae1 /src/testlib/qtestmouse.h | |
| parent | c09ff1dbcb50d77b64e47b333fd1ee2f4c6510e7 (diff) | |
| parent | 605617b5dce6ccd8826d07aabe2db781ae3aa9b4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/testlib/qtestmouse.h')
| -rw-r--r-- | src/testlib/qtestmouse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index 8e1b04e0a0..2cf84a7ea0 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -98,7 +98,7 @@ namespace QTest mouseEvent(MouseRelease, window, button, stateKey, pos); return; } - QTEST_ASSERT(stateKey == 0 || stateKey & Qt::KeyboardModifierMask); + QTEST_ASSERT(uint(stateKey) == 0 || stateKey & Qt::KeyboardModifierMask); stateKey &= static_cast<unsigned int>(Qt::KeyboardModifierMask); |