aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-04-18 09:25:43 +0200
committerKai Koehne <kai.koehne@qt.io>2018-04-19 06:28:46 +0000
commit9b0580f14ef0ca527efb5f397b1440ea79615b3b (patch)
treecd18b8202706499ab30e30eede8a2330b62931f8 /src/imports
parentc35dae0553ef181af263c0bf8f528619324d275e (diff)
Update plugins.qmltypes for QtQuick
Change-Id: I5d2019c079a5e28b7fd8bfcb1ed63e5a5e3fe956 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/qtquick2/plugins.qmltypes46
-rw-r--r--src/imports/qtquick2/qtquick2.pro2
2 files changed, 35 insertions, 13 deletions
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 0fce98a212..6f6f1de8c3 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -noforceqtquick QtQuick 2.10'
+// 'qmlplugindump -nonrelocatable QtQuick 2.11'
Module {
dependencies: []
@@ -19,6 +19,15 @@ Module {
"HorizontalSortHint": 2
}
}
+ Enum {
+ name: "CheckIndexOption"
+ values: {
+ "NoOption": 0,
+ "IndexIsValid": 1,
+ "DoNotUseParent": 2,
+ "ParentIsInvalid": 4
+ }
+ }
Signal {
name: "dataChanged"
Parameter { name: "topLeft"; type: "QModelIndex" }
@@ -936,14 +945,16 @@ Module {
name: "QQuickAnimatedImage"
defaultProperty: "data"
prototype: "QQuickImage"
- exports: ["QtQuick/AnimatedImage 2.0"]
- exportMetaObjectRevisions: [0]
+ exports: ["QtQuick/AnimatedImage 2.0", "QtQuick/AnimatedImage 2.11"]
+ exportMetaObjectRevisions: [0, 11]
Property { name: "playing"; type: "bool" }
Property { name: "paused"; type: "bool" }
Property { name: "currentFrame"; type: "int" }
Property { name: "frameCount"; type: "int"; isReadonly: true }
+ Property { name: "speed"; revision: 11; type: "double" }
Property { name: "sourceSize"; type: "QSize"; isReadonly: true }
Signal { name: "frameChanged" }
+ Signal { name: "speedChanged"; revision: 11 }
}
Component {
name: "QQuickAnimatedSprite"
@@ -1814,6 +1825,9 @@ Module {
Component {
name: "QQuickGrabGestureEvent"
prototype: "QObject"
+ exports: ["QtQuick/GestureEvent 2.0"]
+ isCreatable: false
+ exportMetaObjectRevisions: [0]
Property { name: "touchPoints"; type: "QObject"; isList: true; isReadonly: true }
Property { name: "dragThreshold"; type: "double"; isReadonly: true }
Method { name: "grab" }
@@ -2118,10 +2132,11 @@ Module {
exports: [
"QtQuick/Item 2.0",
"QtQuick/Item 2.1",
+ "QtQuick/Item 2.11",
"QtQuick/Item 2.4",
"QtQuick/Item 2.7"
]
- exportMetaObjectRevisions: [0, 1, 2, 7]
+ exportMetaObjectRevisions: [0, 1, 11, 2, 7]
Enum {
name: "TransformOrigin"
values: {
@@ -2175,6 +2190,7 @@ Module {
Property { name: "antialiasing"; type: "bool" }
Property { name: "implicitWidth"; type: "double" }
Property { name: "implicitHeight"; type: "double" }
+ Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
Signal {
name: "childrenRectChanged"
@@ -2226,6 +2242,7 @@ Module {
revision: 1
Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
}
+ Signal { name: "containmentMaskChanged"; revision: 11 }
Method { name: "update" }
Method {
name: "grabToImage"
@@ -3027,6 +3044,19 @@ Module {
Signal { name: "changed" }
}
Component {
+ name: "QQuickPathAngleArc"
+ prototype: "QQuickCurve"
+ exports: ["QtQuick/PathAngleArc 2.11"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "centerX"; type: "double" }
+ Property { name: "centerY"; type: "double" }
+ Property { name: "radiusX"; type: "double" }
+ Property { name: "radiusY"; type: "double" }
+ Property { name: "startAngle"; type: "double" }
+ Property { name: "sweepAngle"; type: "double" }
+ Property { name: "moveToStart"; type: "bool" }
+ }
+ Component {
name: "QQuickPathAnimation"
prototype: "QQuickAbstractAnimation"
exports: ["QtQuick/PathAnimation 2.0"]
@@ -3416,14 +3446,6 @@ Module {
Parameter { type: "int" }
}
Signal {
- name: "fromChanged"
- Parameter { type: "QVariant" }
- }
- Signal {
- name: "toChanged"
- Parameter { type: "QVariant" }
- }
- Signal {
name: "easingChanged"
Parameter { type: "QEasingCurve" }
}
diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro
index 118343588a..01ac034104 100644
--- a/src/imports/qtquick2/qtquick2.pro
+++ b/src/imports/qtquick2/qtquick2.pro
@@ -1,7 +1,7 @@
CXX_MODULE = qml
TARGET = qtquick2plugin
TARGETPATH = QtQuick.2
-IMPORT_VERSION = 2.6
+IMPORT_VERSION = 2.11
SOURCES += \
plugin.cpp