diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-11 13:50:30 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-28 17:23:20 +0200 |
| commit | 09025084110702a17b1edd7e2e80cd9e063e64fd (patch) | |
| tree | 980bed89411f5dd79bf5db5d6dea4803261ea8d1 /tests/auto/widgets/widgets/qspinbox | |
| parent | 673da7d4607cd5597b3c58f8c118459efdcaaeb3 (diff) | |
Fix compiler warnings from QKeyCombination
Change lots of code to avoid the deprecated operator+() or implicit
casts to int.
Change-Id: I0c343cd5b28603afdf1214eefb85e928313345e2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets/qspinbox')
| -rw-r--r-- | tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index e9c4d3b0d6..35f796a37f 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -1047,7 +1047,7 @@ void tst_QSpinBox::undoRedo() QVERIFY(spin.lineEdit()->isUndoAvailable()); //testing CTRL+Z (undo) - int val = QKeySequence(QKeySequence::Undo)[0]; + int val = QKeySequence(QKeySequence::Undo)[0].toCombined(); Qt::KeyboardModifiers mods = (Qt::KeyboardModifiers)(val & Qt::KeyboardModifierMask); QTest::keyClick(&spin, val & ~mods, mods); @@ -1056,7 +1056,7 @@ void tst_QSpinBox::undoRedo() QVERIFY(spin.lineEdit()->isRedoAvailable()); //testing CTRL+Y (redo) - val = QKeySequence(QKeySequence::Redo)[0]; + val = QKeySequence(QKeySequence::Redo)[0].toCombined(); mods = (Qt::KeyboardModifiers)(val & Qt::KeyboardModifierMask); QTest::keyClick(&spin, val & ~mods, mods); QCOMPARE(spin.value(), 1); |