diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-21 10:34:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-21 10:34:41 +0100 |
| commit | c08ec43406c4ebe2e93942a8b07871c73aafde51 (patch) | |
| tree | 69e84f955ce6d0f66d39eae36b07ae0f8ef65e56 /src/imports | |
| parent | 242067390f3bd891b162164a2d01a3a982c64fa2 (diff) | |
| parent | 5b82c1b7abc515274e6348136356bbf8f1374e4a (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I3567f741394f912d4312460e85555b6c39b61cb4
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" } |