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/imports | |
| 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/imports')
| -rw-r--r-- | src/imports/qtquick2/plugins.qmltypes | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes index f0645213b0..b11906ee09 100644 --- a/src/imports/qtquick2/plugins.qmltypes +++ b/src/imports/qtquick2/plugins.qmltypes @@ -3478,7 +3478,8 @@ Module { exports: ["QtQuick/Shortcut 2.5", "QtQuick/Shortcut 2.6"] exportMetaObjectRevisions: [0, 1] Property { name: "sequence"; type: "QVariant" } - Property { name: "sequenceString"; revision: 1; type: "string"; isReadonly: true } + Property { name: "nativeText"; revision: 1; type: "string"; isReadonly: true } + Property { name: "portableText"; revision: 1; type: "string"; isReadonly: true } Property { name: "enabled"; type: "bool" } Property { name: "autoRepeat"; type: "bool" } Property { name: "context"; type: "Qt::ShortcutContext" } |