diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-02 19:55:30 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-05 14:49:45 +0000 |
| commit | 15a07dbd30e3b242a0495eb6a3316411b493fab3 (patch) | |
| tree | 9ee48f6736d579255d959c3005c598bb2409d165 /src/quick/util/qquickshortcut_p.h | |
| parent | 01069f8b3161db991d13513013b4487a8ac7d3cf (diff) | |
Shortcut: make both nativeText and portableText available
They have different use cases. One is for display purposes,
whereas the other is suitable for storing to settings etc.
[ChangeLog][QtQuick] Added Shortcut.nativeText and portableText
properties to read back the key sequence as a string
Change-Id: I5575925ae08ccc9fa8933afc053651b0f3813181
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Diffstat (limited to 'src/quick/util/qquickshortcut_p.h')
| -rw-r--r-- | src/quick/util/qquickshortcut_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/util/qquickshortcut_p.h b/src/quick/util/qquickshortcut_p.h index db02f8afae..d8a233af78 100644 --- a/src/quick/util/qquickshortcut_p.h +++ b/src/quick/util/qquickshortcut_p.h @@ -57,7 +57,8 @@ class QQuickShortcut : public QObject, public QQmlParserStatus Q_OBJECT Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QVariant sequence READ sequence WRITE setSequence NOTIFY sequenceChanged FINAL) - Q_PROPERTY(QString sequenceString READ sequenceString NOTIFY sequenceChanged FINAL REVISION 1) + Q_PROPERTY(QString nativeText READ nativeText NOTIFY sequenceChanged FINAL REVISION 1) + Q_PROPERTY(QString portableText READ portableText NOTIFY sequenceChanged FINAL REVISION 1) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL) Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL) Q_PROPERTY(Qt::ShortcutContext context READ context WRITE setContext NOTIFY contextChanged FINAL) @@ -69,7 +70,8 @@ public: QVariant sequence() const; void setSequence(const QVariant &sequence); - Q_REVISION(1) QString sequenceString() const; + QString nativeText() const; + QString portableText() const; bool isEnabled() const; void setEnabled(bool enabled); |