diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:22 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:22 +0200 |
| commit | 5e31cdc9dda940aee38cf8de4ddbbeb2c0cebfc7 (patch) | |
| tree | 010b48a0a96c33852012f614043e6e881c1b2bf6 /src/quicktemplates2/qquickaction.cpp | |
| parent | 3a657dc092bea4d21f281368b0caad01e1aa6e32 (diff) | |
| parent | edb18d6101e8bb9dd265330dbe019722181d7577 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: I09434c9f6ff3112e4a8abe1bdf6036d789dfaabf
Diffstat (limited to 'src/quicktemplates2/qquickaction.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickaction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates2/qquickaction.cpp index 2041e774..8610cdfa 100644 --- a/src/quicktemplates2/qquickaction.cpp +++ b/src/quicktemplates2/qquickaction.cpp @@ -145,7 +145,7 @@ int QQuickActionPrivate::ShortcutEntry::shortcutId() const void QQuickActionPrivate::ShortcutEntry::grab(const QKeySequence &shortcut, bool enabled) { - if (shortcut.isEmpty()) + if (shortcut.isEmpty() || m_shortcutId) return; Qt::ShortcutContext context = Qt::WindowShortcut; // TODO |