diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-28 16:23:15 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-29 09:24:29 +0000 |
| commit | 47955ed4fa76167f46d9eff6f15bfaaa6ebffdf6 (patch) | |
| tree | df580425fdd835e9dfc993a8873d59b5ae7597a6 /src/plugins/qmljseditor | |
| parent | 5722ab8706522b42e01366e1e6c8a4a623f2465e (diff) | |
Adapt to key sequence changes in Qt6
Use operator| instead of operator+ which was removed.
Individual keys in QKeySequence are now QKeyCombinations instead of
ints.
Task-number: QTCREATORBUG-24098
Change-Id: I43a6122cf660e6a6de7edbf3ac9954e0a39cec06
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/plugins/qmljseditor')
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditorplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 9e82914fb81..7414a1a972b 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -191,8 +191,8 @@ QmlJSEditorPluginPrivate::QmlJSEditorPluginPrivate() QAction *showQuickToolbar = new QAction(QmlJSEditorPlugin::tr("Show Qt Quick Toolbar"), this); cmd = ActionManager::registerAction(showQuickToolbar, Constants::SHOW_QT_QUICK_HELPER, context); - cmd->setDefaultKeySequence(useMacShortcuts ? QKeySequence(Qt::META + Qt::ALT + Qt::Key_Space) - : QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Space)); + cmd->setDefaultKeySequence(useMacShortcuts ? QKeySequence(Qt::META | Qt::ALT | Qt::Key_Space) + : QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_Space)); connect(showQuickToolbar, &QAction::triggered, this, &QmlJSEditorPluginPrivate::showContextPane); contextMenu->addAction(cmd); qmlToolsMenu->addAction(cmd); |