diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-22 14:05:16 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-22 16:52:04 +0000 |
commit | 77023678f9f39d21a230cfffbf492fc238165a5c (patch) | |
tree | 3d8765759102e4737781774444769c211b71e8bd /src/imports/templates | |
parent | deecd627f425db37b41173798cb8c42dfb17fe03 (diff) |
Update plugins.qmltypes
Change-Id: I54d19667a4f72c34174b8235f9ae24b533be2209
Task-number: QTBUG-51278
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/templates')
-rw-r--r-- | src/imports/templates/plugins.qmltypes | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index 1879dc6c..7c0add11 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/plugins.qmltypes @@ -179,6 +179,7 @@ Module { Property { name: "spacing"; type: "double" } Property { name: "locale"; type: "QLocale" } Property { name: "mirrored"; type: "bool"; isReadonly: true } + Property { name: "focusPolicy"; type: "Qt::FocusPolicy" } Property { name: "focusReason"; type: "Qt::FocusReason" } Property { name: "background"; type: "QQuickItem"; isPointer: true } Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } @@ -229,7 +230,6 @@ Module { prototype: "QQuickPane" exports: ["Qt.labs.templates/Frame 1.0"] exportMetaObjectRevisions: [0] - Property { name: "frame"; type: "QQuickItem"; isPointer: true } } Component { name: "QQuickGroupBox" @@ -700,6 +700,14 @@ Module { prototype: "QQuickContainer" exports: ["Qt.labs.templates/TabBar 1.0"] exportMetaObjectRevisions: [0] + Enum { + name: "Position" + values: { + "Header": 0, + "Footer": 1 + } + } + Property { name: "position"; type: "Position" } } Component { name: "QQuickTabButton" @@ -1005,6 +1013,8 @@ Module { Property { name: "leftPadding"; revision: 6; type: "double" } Property { name: "rightPadding"; revision: 6; type: "double" } Property { name: "bottomPadding"; revision: 6; type: "double" } + Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true } + Signal { name: "preeditTextChanged"; revision: 7 } Signal { name: "contentSizeChanged" } Signal { name: "colorChanged" @@ -1116,6 +1126,7 @@ Module { revision: 2 Parameter { name: "text"; type: "string" } } + Method { name: "clear"; revision: 7 } Method { name: "inputMethodQuery" revision: 4 @@ -1268,6 +1279,7 @@ Module { Property { name: "passwordCharacter"; type: "string" } Property { name: "passwordMaskDelay"; revision: 3; type: "int" } Property { name: "displayText"; type: "string"; isReadonly: true } + Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true } Property { name: "autoScroll"; type: "bool" } Property { name: "selectByMouse"; type: "bool" } Property { name: "mouseSelectionMode"; type: "SelectionMode" } @@ -1323,6 +1335,7 @@ Module { revision: 3 Parameter { name: "delay"; type: "int" } } + Signal { name: "preeditTextChanged"; revision: 7 } Signal { name: "activeFocusOnPressChanged" Parameter { name: "activeFocusOnPress"; type: "bool" } @@ -1379,6 +1392,7 @@ Module { revision: 3 Parameter { name: "position"; type: "int" } } + Method { name: "clear"; revision: 7 } Method { name: "positionAt" Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } @@ -1417,6 +1431,14 @@ Module { prototype: "QQuickFrame" exports: ["Qt.labs.templates/ToolBar 1.0"] exportMetaObjectRevisions: [0] + Enum { + name: "Position" + values: { + "Header": 0, + "Footer": 1 + } + } + Property { name: "position"; type: "Position" } } Component { name: "QQuickToolButton" |