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/qmenu/tst_qmenu.cpp | |
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/qmenu/tst_qmenu.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 81ec5c77d0..35611d470d 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -299,7 +299,7 @@ void tst_QMenu::addActionsConnect() menu.addAction(icon, text, testFunction); menu.addAction(icon, text, &menu, testFunction); #ifndef QT_NO_SHORTCUT - const QKeySequence keySequence(Qt::CTRL + Qt::Key_C); + const QKeySequence keySequence(Qt::CTRL | Qt::Key_C); menu.addAction(text, &menu, SLOT(deleteLater()), keySequence); menu.addAction(text, &menu, &QMenu::deleteLater, keySequence); menu.addAction(text, testFunction, keySequence); |