diff options
Diffstat (limited to 'src/imports/qtquick2/plugins.qmltypes')
-rw-r--r-- | src/imports/qtquick2/plugins.qmltypes | 45 |
1 files changed, 36 insertions, 9 deletions
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes index 834b4bfac2..d23d6cc311 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.9' +// 'qmlplugindump -nonrelocatable -noforceqtquick QtQuick 2.10' Module { dependencies: [] @@ -1517,8 +1517,12 @@ Module { name: "QQuickFlickable" defaultProperty: "flickableData" prototype: "QQuickItem" - exports: ["QtQuick/Flickable 2.0", "QtQuick/Flickable 2.9"] - exportMetaObjectRevisions: [0, 9] + exports: [ + "QtQuick/Flickable 2.0", + "QtQuick/Flickable 2.10", + "QtQuick/Flickable 2.9" + ] + exportMetaObjectRevisions: [0, 10, 9] Enum { name: "BoundsBehavior" values: { @@ -1529,6 +1533,12 @@ Module { } } Enum { + name: "BoundsMovement" + values: { + "FollowBoundsBehavior": 1 + } + } + Enum { name: "FlickableDirection" values: { "AutoFlickDirection": 0, @@ -1552,6 +1562,7 @@ Module { Property { name: "horizontalVelocity"; type: "double"; isReadonly: true } Property { name: "verticalVelocity"; type: "double"; isReadonly: true } Property { name: "boundsBehavior"; type: "BoundsBehavior" } + Property { name: "boundsMovement"; revision: 10; type: "BoundsMovement" } Property { name: "rebound"; type: "QQuickTransition"; isPointer: true } Property { name: "maximumFlickVelocity"; type: "double" } Property { name: "flickDeceleration"; type: "double" } @@ -1583,6 +1594,7 @@ Module { Property { name: "flickableData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "flickableChildren"; type: "QQuickItem"; isList: true; isReadonly: true } Signal { name: "isAtBoundaryChanged" } + Signal { name: "boundsMovementChanged"; revision: 10 } Signal { name: "movementStarted" } Signal { name: "movementEnded" } Signal { name: "flickStarted" } @@ -1795,6 +1807,7 @@ Module { Property { name: "letterSpacing"; type: "double" } Property { name: "wordSpacing"; type: "double" } Property { name: "hintingPreference"; type: "HintingPreference" } + Property { name: "kerning"; type: "bool" } Method { name: "toString"; type: "string" } } Component { @@ -2088,8 +2101,6 @@ Module { prototype: "QQuickItem" Property { name: "implicitWidth"; type: "double"; isReadonly: true } Property { name: "implicitHeight"; type: "double"; isReadonly: true } - Signal { name: "implicitWidthChanged2"; revision: 1 } - Signal { name: "implicitHeightChanged2"; revision: 1 } } Component { name: "QQuickIntValidator" @@ -2300,6 +2311,7 @@ Module { Property { name: "samplerName"; type: "QByteArray" } Property { name: "effect"; type: "QQmlComponent"; isPointer: true } Property { name: "textureMirroring"; type: "QQuickShaderEffectSource::TextureMirroring" } + Property { name: "samples"; type: "int" } Signal { name: "enabledChanged" Parameter { name: "enabled"; type: "bool" } @@ -2340,6 +2352,10 @@ Module { name: "textureMirroringChanged" Parameter { name: "mirroring"; type: "QQuickShaderEffectSource::TextureMirroring" } } + Signal { + name: "samplesChanged" + Parameter { name: "count"; type: "int" } + } } Component { name: "QQuickItemView" @@ -3065,8 +3081,8 @@ Module { Component { name: "QQuickPathArc" prototype: "QQuickCurve" - exports: ["QtQuick/PathArc 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/PathArc 2.0", "QtQuick/PathArc 2.9"] + exportMetaObjectRevisions: [0, 2] Enum { name: "ArcDirection" values: { @@ -3078,6 +3094,8 @@ Module { Property { name: "radiusY"; type: "double" } Property { name: "useLargeArc"; type: "bool" } Property { name: "direction"; type: "ArcDirection" } + Property { name: "xAxisRotation"; revision: 2; type: "double" } + Signal { name: "xAxisRotationChanged"; revision: 2 } } Component { name: "QQuickPathAttribute" @@ -3130,6 +3148,12 @@ Module { exportMetaObjectRevisions: [0] } Component { + name: "QQuickPathMove" + prototype: "QQuickCurve" + exports: ["QtQuick/PathMove 2.9"] + exportMetaObjectRevisions: [0] + } + Component { name: "QQuickPathPercent" prototype: "QQuickPathElement" exports: ["QtQuick/PathPercent 2.0"] @@ -3594,9 +3618,10 @@ Module { prototype: "QQuickItem" exports: [ "QtQuick/ShaderEffectSource 2.0", - "QtQuick/ShaderEffectSource 2.6" + "QtQuick/ShaderEffectSource 2.6", + "QtQuick/ShaderEffectSource 2.9" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "WrapMode" values: { @@ -3632,6 +3657,7 @@ Module { Property { name: "mipmap"; type: "bool" } Property { name: "recursive"; type: "bool" } Property { name: "textureMirroring"; revision: 1; type: "TextureMirroring" } + Property { name: "samples"; revision: 2; type: "int" } Signal { name: "scheduledUpdateCompleted" } Method { name: "scheduleUpdate" } } @@ -4084,6 +4110,7 @@ Module { Property { name: "rightPadding"; revision: 6; type: "double" } Property { name: "bottomPadding"; revision: 6; type: "double" } Property { name: "fontInfo"; revision: 9; type: "QJSValue"; isReadonly: true } + Property { name: "advance"; revision: 10; type: "QSizeF"; isReadonly: true } Signal { name: "textChanged" Parameter { name: "text"; type: "string" } |