diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-04 21:58:18 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-07 11:34:59 +0200 |
| commit | ae8239a53ea9c512d60f54903c741aab33a6b439 (patch) | |
| tree | 04006f91bcfd403cfd8e6432adbf7f97b0b2bf5b /src/designer/src/designer/qdesigner_actions.cpp | |
| parent | 3e67b5e4df84421b77f90cbf242abb4a3c4c93a5 (diff) | |
Use operator| to compose key sequences
In preparation for deprecating operator+.
It's deprecated in C++20. Insert casts as necessary. Drive-by,
prepare for deprecation of operator+ for building key sequences.
Initial-patch-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Pick-to: 5.15
Change-Id: Iaae4e35a56aa1c2365bc25af2582cf820de38d5e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/designer/qdesigner_actions.cpp')
| -rw-r--r-- | src/designer/src/designer/qdesigner_actions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index e0a7d7136..d21eb010c 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -442,7 +442,7 @@ QActionGroup *QDesignerActions::createHelpActions() QAction *mainHelpAction = new QAction(tr("Qt Designer &Help"), this); mainHelpAction->setObjectName(QStringLiteral("__qt_designer_help_action")); connect(mainHelpAction, &QAction::triggered, this, &QDesignerActions::showDesignerHelp); - mainHelpAction->setShortcut(Qt::CTRL + Qt::Key_Question); + mainHelpAction->setShortcut(Qt::CTRL | Qt::Key_Question); helpActions->addAction(mainHelpAction); helpActions->addAction(createSeparator(this)); |