diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 21:24:20 +0300 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 21:24:32 +0300 |
commit | 2dc6251ecf98422fec842d924246c678b29bc333 (patch) | |
tree | 7aefa07177e91a0adb8f38a0e452f312321c789f /src/imports/templates | |
parent | 5479c13959406ec5622fba22f8581f0d5cb09bf9 (diff) | |
parent | 7faafa470eee71c51255e276e7b9df5beed2dd5b (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I67d0991de16ad1039848df5099db59ea6aa728f8
Diffstat (limited to 'src/imports/templates')
-rw-r--r-- | src/imports/templates/plugins.qmltypes | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index 0ff02f22..712cf3b6 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/plugins.qmltypes @@ -12,8 +12,11 @@ Module { name: "QQuickAbstractButton" defaultProperty: "data" prototype: "QQuickControl" - exports: ["QtQuick.Templates/AbstractButton 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQuick.Templates/AbstractButton 2.0", + "QtQuick.Templates/AbstractButton 2.2" + ] + exportMetaObjectRevisions: [0, 2] Property { name: "text"; type: "string" } Property { name: "down"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } @@ -32,14 +35,14 @@ Module { } Component { name: "QQuickApplicationWindow" - defaultProperty: "data" + defaultProperty: "contentData" prototype: "QQuickWindowQmlImpl" exports: ["QtQuick.Templates/ApplicationWindow 2.0"] exportMetaObjectRevisions: [0] attachedType: "QQuickApplicationWindowAttached" Property { name: "background"; type: "QQuickItem"; isPointer: true } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "activeFocusControl"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "header"; type: "QQuickItem"; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isPointer: true } @@ -1045,6 +1048,8 @@ Module { Property { name: "position"; type: "Position" } Property { name: "contentWidth"; revision: 2; type: "double" } Property { name: "contentHeight"; revision: 2; type: "double" } + Signal { name: "contentWidthChanged"; revision: 2 } + Signal { name: "contentHeightChanged"; revision: 2 } } Component { name: "QQuickTabButton" |