aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-11-30 11:22:05 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-30 15:30:29 +0100
commit2dde4534f956d5db5ad8b0cd29671808e1d94c59 (patch)
treea16988b12e00ea9cec00568fe3c687416388203d
parent6daa13b55a0e6685d7397e93e4c37c739ede9268 (diff)
Qmltypes: Update plugins.qmltypes
Change-Id: I5388ece0f62a57566d7059077c88bb42e81b3238 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r--src/imports/qtquick2/plugins.qmltypes61
1 files changed, 30 insertions, 31 deletions
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 7e5086c077..12ea9334f8 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -228,6 +228,15 @@ Module {
}
}
Component {
+ name: "QQmlBind"
+ prototype: "QObject"
+ exports: ["QtQml/Binding 2.0", "QtQuick/Binding 2.0"]
+ Property { name: "target"; type: "QObject"; isPointer: true }
+ Property { name: "property"; type: "string" }
+ Property { name: "value"; type: "QVariant" }
+ Property { name: "when"; type: "bool" }
+ }
+ Component {
name: "QQmlComponent"
prototype: "QObject"
exports: [
@@ -286,6 +295,13 @@ Module {
Signal { name: "destruction" }
}
Component {
+ name: "QQmlConnections"
+ prototype: "QObject"
+ exports: ["QtQml/Connections 2.0", "QtQuick/Connections 2.0"]
+ Property { name: "target"; type: "QObject"; isPointer: true }
+ Property { name: "ignoreUnknownSignals"; type: "bool" }
+ }
+ Component {
name: "QQmlEasingValueType"
prototype: "QQmlValueType"
exports: ["QtQuick/Easing 2.0"]
@@ -387,6 +403,20 @@ Module {
}
}
}
+ Component {
+ name: "QQmlTimer"
+ prototype: "QObject"
+ exports: ["QtQml/Timer 2.0", "QtQuick/Timer 2.0"]
+ Property { name: "interval"; type: "int" }
+ Property { name: "running"; type: "bool" }
+ Property { name: "repeat"; type: "bool" }
+ Property { name: "triggeredOnStart"; type: "bool" }
+ Property { name: "parent"; type: "QObject"; isReadonly: true; isPointer: true }
+ Signal { name: "triggered" }
+ Method { name: "start" }
+ Method { name: "stop" }
+ Method { name: "restart" }
+ }
Component { name: "QQmlValueType"; prototype: "QObject" }
Component {
name: "QQuickAbstractAnimation"
@@ -708,15 +738,6 @@ Module {
Property { name: "enabled"; type: "bool" }
}
Component {
- name: "QQuickBind"
- prototype: "QObject"
- exports: ["QtQuick/Binding 2.0"]
- Property { name: "target"; type: "QObject"; isPointer: true }
- Property { name: "property"; type: "string" }
- Property { name: "value"; type: "QVariant" }
- Property { name: "when"; type: "bool" }
- }
- Component {
name: "QQuickBorderImage"
defaultProperty: "data"
prototype: "QQuickImageBase"
@@ -835,13 +856,6 @@ Module {
exports: ["QtQuick/Column 2.0"]
}
Component {
- name: "QQuickConnections"
- prototype: "QObject"
- exports: ["QtQuick/Connections 2.0"]
- Property { name: "target"; type: "QObject"; isPointer: true }
- Property { name: "ignoreUnknownSignals"; type: "bool" }
- }
- Component {
name: "QQuickCurve"
prototype: "QQuickPathElement"
Property { name: "x"; type: "double" }
@@ -1322,7 +1336,6 @@ Module {
Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
- Property { name: "pos"; type: "QPointF"; isReadonly: true }
Property { name: "x"; type: "double" }
Property { name: "y"; type: "double" }
Property { name: "z"; type: "double" }
@@ -3466,20 +3479,6 @@ Module {
}
}
Component {
- name: "QQuickTimer"
- prototype: "QObject"
- exports: ["QtQuick/Timer 2.0"]
- Property { name: "interval"; type: "int" }
- Property { name: "running"; type: "bool" }
- Property { name: "repeat"; type: "bool" }
- Property { name: "triggeredOnStart"; type: "bool" }
- Property { name: "parent"; type: "QObject"; isReadonly: true; isPointer: true }
- Signal { name: "triggered" }
- Method { name: "start" }
- Method { name: "stop" }
- Method { name: "restart" }
- }
- Component {
name: "QQuickTouchPoint"
prototype: "QObject"
exports: ["QtQuick/TouchPoint 2.0"]