diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-06-12 23:48:01 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-20 23:59:31 +0200 |
| commit | ffbf8d724f39e9c8d05ae2049e8b79a61570e235 (patch) | |
| tree | b1bdf614d2063eb71cc50f0f21d58076e8f21a72 /src/controls/qquickaction_p.h | |
| parent | 0a3192fe4100dd790dc1467cc2cab200fb996ab0 (diff) | |
| download | qtquickcontrols-ffbf8d724f39e9c8d05ae2049e8b79a61570e235.tar.gz | |
Support StandardKeys for Action/MenuItem::shortcut
Change-Id: I2054a59fcda26795721e5d7d04cc644220da372b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src/controls/qquickaction_p.h')
| -rw-r--r-- | src/controls/qquickaction_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/controls/qquickaction_p.h b/src/controls/qquickaction_p.h index aa63b408..373627d1 100644 --- a/src/controls/qquickaction_p.h +++ b/src/controls/qquickaction_p.h @@ -68,7 +68,7 @@ class QQuickAction : public QObject Q_PROPERTY(QQuickExclusiveGroup *exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged) #ifndef QT_NO_SHORTCUT - Q_PROPERTY(QString shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged) + Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged) #endif public: @@ -79,8 +79,8 @@ public: void resetText() { setText(QString()); } void setText(const QString &text); - QString shortcut() const; - void setShortcut(const QString &shortcut); + QVariant shortcut() const; + void setShortcut(const QVariant &shortcut); void setMnemonicFromText(const QString &mnemonic); @@ -121,7 +121,7 @@ Q_SIGNALS: void toggled(bool checked); void textChanged(); - void shortcutChanged(QString shortcut); + void shortcutChanged(QVariant shortcut); void iconChanged(); void iconNameChanged(); |