diff options
Diffstat (limited to 'src/quicktemplates2/qquickaction.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickaction.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates2/qquickaction.cpp index 0dab3b97..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 @@ -381,7 +381,6 @@ void QQuickAction::setText(const QString &text) } /*! - \qmlpropertygroup QtQuick.Controls::Action::icon \qmlproperty string QtQuick.Controls::Action::icon.name \qmlproperty url QtQuick.Controls::Action::icon.source \qmlproperty int QtQuick.Controls::Action::icon.width |