summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-04-21 17:44:09 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-04-21 15:44:28 +0000
commit370651d6e50ce33b613cfdf4b16b6fb5acfd2310 (patch)
treeccb762ffb3fec6855d1c2c37a37457654270528a
parent8dc1ddc14cbd146ad14f66c09a449afaad9f4885 (diff)
Update plugins.qmltypes
Change-Id: I106f1efad34b74af68dc59323aa6739212a78976 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
-rw-r--r--src/imports/controls/plugins.qmltypes15
-rw-r--r--src/imports/templates/plugins.qmltypes13
2 files changed, 19 insertions, 9 deletions
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index affdfb96..1e1b9d0f 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -115,7 +115,7 @@ Module {
exports: ["QtQuick.Controls/ApplicationWindow 2.0"]
exportMetaObjectRevisions: [0]
isComposite: true
- defaultProperty: "data"
+ defaultProperty: "contentData"
}
Component {
prototype: "QQuickBusyIndicator"
@@ -525,8 +525,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 }
@@ -545,14 +548,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 }
@@ -1558,6 +1561,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"
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"