diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-07 01:35:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-07 01:35:46 +0100 |
| commit | f0cd88c0d7af9a477bf90545975d289915e89033 (patch) | |
| tree | 40d16da8a9d35a92b72d7612156a606b83dd7a12 /src/imports/templates/plugins.qmltypes | |
| parent | 66487fec4c558d8b77dd0573e524a61d11e33c2a (diff) | |
| parent | 4d0294352f975c3916dfbba48f21e5b76da432c0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/imports/controls/universal/ToolButton.qml
Change-Id: Ib9f1e7d83fb824d9e6a13a2bc429d1a5642fe4f6
Diffstat (limited to 'src/imports/templates/plugins.qmltypes')
| -rw-r--r-- | src/imports/templates/plugins.qmltypes | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index d3ca28fc..792d4e95 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/plugins.qmltypes @@ -379,6 +379,7 @@ Module { } Property { name: "x"; type: "double" } Property { name: "y"; type: "double" } + Property { name: "z"; type: "double" } Property { name: "width"; type: "double" } Property { name: "height"; type: "double" } Property { name: "implicitWidth"; type: "double" } @@ -402,9 +403,13 @@ Module { Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "clip"; type: "bool" } Property { name: "focus"; type: "bool" } + Property { name: "activeFocus"; type: "bool"; isReadonly: true } Property { name: "modal"; type: "bool" } Property { name: "visible"; type: "bool" } + Property { name: "opacity"; type: "double" } + Property { name: "scale"; type: "double" } Property { name: "closePolicy"; type: "ClosePolicy" } Property { name: "transformOrigin"; type: "TransformOrigin" } Property { name: "enter"; type: "QQuickTransition"; isPointer: true } |