diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:21:42 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:21:42 +0200 |
commit | 6a0bb9a7d6a6473920da74bb48c52a4eaed990b0 (patch) | |
tree | 3a32c56b1fe21c96d5982511e0b4815c1c07dfbb /src/imports/qtquick2 | |
parent | f0d23d3ff9da26a71295a6abd356c8d366d17439 (diff) | |
parent | 2746518c76e02c642ff29faf568de4de90216e58 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I4a91928610f79c8e21a05781953ffa41508c828a
Diffstat (limited to 'src/imports/qtquick2')
-rw-r--r-- | src/imports/qtquick2/plugins.qmltypes | 247 |
1 files changed, 192 insertions, 55 deletions
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes index f006c874da..c8aae2087d 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 -dependencies dependencies.json QtQuick 2.13' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick 2.14' Module { dependencies: [] @@ -529,8 +529,8 @@ Module { Signal { name: "defaultIncludeChanged" } Signal { name: "changed" - Parameter { name: "removed"; type: "QQmlV4Handle" } - Parameter { name: "inserted"; type: "QQmlV4Handle" } + Parameter { name: "removed"; type: "QJSValue" } + Parameter { name: "inserted"; type: "QJSValue" } } Method { name: "insert" @@ -566,7 +566,7 @@ Module { } Method { name: "get" - type: "QQmlV4Handle" + type: "QJSValue" Parameter { name: "index"; type: "int" } } } @@ -646,6 +646,7 @@ Module { exportMetaObjectRevisions: [0] Property { name: "count"; type: "int"; isReadonly: true } Property { name: "dynamicRoles"; type: "bool" } + Property { name: "agent"; revision: 14; type: "QObject"; isReadonly: true; isPointer: true } Method { name: "clear" } Method { name: "remove" @@ -661,13 +662,61 @@ Module { } Method { name: "get" - type: "QQmlV4Handle" + type: "QJSValue" Parameter { name: "index"; type: "int" } } Method { name: "set" Parameter { name: "index"; type: "int" } - Parameter { type: "QQmlV4Handle" } + Parameter { name: "value"; type: "QJSValue" } + } + Method { + name: "setProperty" + Parameter { name: "index"; type: "int" } + Parameter { name: "property"; type: "string" } + Parameter { name: "value"; type: "QVariant" } + } + Method { + name: "move" + Parameter { name: "from"; type: "int" } + Parameter { name: "to"; type: "int" } + Parameter { name: "count"; type: "int" } + } + Method { name: "sync" } + } + Component { + name: "QQmlListModelWorkerAgent" + prototype: "QObject" + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "engine"; type: "QV4::ExecutionEngine"; isPointer: true } + Signal { + name: "engineChanged" + Parameter { name: "engine"; type: "QV4::ExecutionEngine"; isPointer: true } + } + Method { name: "addref" } + Method { name: "release" } + Method { name: "clear" } + Method { + name: "remove" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "append" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "insert" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "get" + type: "QJSValue" + Parameter { name: "index"; type: "int" } + } + Method { + name: "set" + Parameter { name: "index"; type: "int" } + Parameter { name: "value"; type: "QJSValue" } } Method { name: "setProperty" @@ -1300,7 +1349,7 @@ Module { } Property { name: "available"; type: "bool"; isReadonly: true } Property { name: "contextType"; type: "string" } - Property { name: "context"; type: "QQmlV4Handle"; isReadonly: true } + Property { name: "context"; type: "QJSValue"; isReadonly: true } Property { name: "canvasSize"; type: "QSizeF" } Property { name: "tileSize"; type: "QSize" } Property { name: "canvasWindow"; type: "QRectF" } @@ -1480,9 +1529,19 @@ Module { prototype: "QQuickMultiPointHandler" exports: ["QtQuick/DragHandler 2.12"] exportMetaObjectRevisions: [0] + Enum { + name: "SnapMode" + values: { + "NoSnap": 0, + "SnapAuto": 1, + "SnapIfPressedOutsideTarget": 2, + "SnapAlways": 3 + } + } Property { name: "xAxis"; type: "QQuickDragAxis"; isReadonly: true; isPointer: true } Property { name: "yAxis"; type: "QQuickDragAxis"; isReadonly: true; isPointer: true } Property { name: "translation"; type: "QVector2D"; isReadonly: true } + Property { name: "snapMode"; type: "SnapMode" } } Component { name: "QQuickDropArea" @@ -1959,7 +2018,13 @@ Module { "Unknown": 0, "Software": 1, "OpenGL": 2, - "Direct3D12": 3 + "Direct3D12": 3, + "OpenVG": 4, + "OpenGLRhi": 5, + "Direct3D11Rhi": 6, + "VulkanRhi": 7, + "MetalRhi": 8, + "NullRhi": 9 } } Enum { @@ -1967,7 +2032,8 @@ Module { values: { "UnknownShadingLanguage": 0, "GLSL": 1, - "HLSL": 2 + "HLSL": 2, + "RhiShader": 3 } } Enum { @@ -2131,7 +2197,7 @@ Module { "QtQuick/Image 2.3", "QtQuick/Image 2.5" ] - exportMetaObjectRevisions: [0, 1, 2] + exportMetaObjectRevisions: [0, 3, 5] Enum { name: "HAlignment" values: { @@ -2165,8 +2231,8 @@ Module { Property { name: "paintedHeight"; type: "double"; isReadonly: true } Property { name: "horizontalAlignment"; type: "HAlignment" } Property { name: "verticalAlignment"; type: "VAlignment" } - Property { name: "mipmap"; revision: 1; type: "bool" } - Property { name: "autoTransform"; revision: 2; type: "bool" } + Property { name: "mipmap"; revision: 3; type: "bool" } + Property { name: "autoTransform"; revision: 5; type: "bool" } Signal { name: "paintedGeometryChanged" } Signal { name: "horizontalAlignmentChanged" @@ -2178,10 +2244,10 @@ Module { } Signal { name: "mipmapChanged" - revision: 1 + revision: 3 Parameter { type: "bool" } } - Signal { name: "autoTransformChanged"; revision: 2 } + Signal { name: "autoTransformChanged"; revision: 5 } } Component { name: "QQuickImageBase" @@ -2242,7 +2308,7 @@ Module { "QtQuick/Item 2.4", "QtQuick/Item 2.7" ] - exportMetaObjectRevisions: [0, 1, 11, 2, 7] + exportMetaObjectRevisions: [0, 1, 11, 4, 7] Enum { name: "Flags" values: { @@ -2362,14 +2428,14 @@ Module { Method { name: "update" } Method { name: "grabToImage" - revision: 2 + revision: 4 type: "bool" Parameter { name: "callback"; type: "QJSValue" } Parameter { name: "targetSize"; type: "QSize" } } Method { name: "grabToImage" - revision: 2 + revision: 4 type: "bool" Parameter { name: "callback"; type: "QJSValue" } } @@ -2502,7 +2568,7 @@ Module { "QtQuick/ItemView 2.7" ] isCreatable: false - exportMetaObjectRevisions: [1, 13, 2, 7] + exportMetaObjectRevisions: [1, 13, 3, 7] Enum { name: "LayoutDirection" values: { @@ -2546,8 +2612,8 @@ Module { Property { name: "keyNavigationWraps"; type: "bool" } Property { name: "keyNavigationEnabled"; revision: 7; type: "bool" } Property { name: "cacheBuffer"; type: "int" } - Property { name: "displayMarginBeginning"; revision: 2; type: "int" } - Property { name: "displayMarginEnd"; revision: 2; type: "int" } + Property { name: "displayMarginBeginning"; revision: 3; type: "int" } + Property { name: "displayMarginEnd"; revision: 3; type: "int" } Property { name: "layoutDirection"; type: "Qt::LayoutDirection" } Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true } Property { name: "verticalLayoutDirection"; type: "VerticalLayoutDirection" } @@ -2858,7 +2924,7 @@ Module { "QtQuick/ListView 2.4", "QtQuick/ListView 2.7" ] - exportMetaObjectRevisions: [0, 1, 2, 7] + exportMetaObjectRevisions: [0, 1, 4, 7] attachedType: "QQuickListViewAttached" Enum { name: "Orientation" @@ -2899,10 +2965,10 @@ Module { Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true } Property { name: "currentSection"; type: "string"; isReadonly: true } Property { name: "snapMode"; type: "SnapMode" } - Property { name: "headerPositioning"; revision: 2; type: "HeaderPositioning" } - Property { name: "footerPositioning"; revision: 2; type: "FooterPositioning" } - Signal { name: "headerPositioningChanged"; revision: 2 } - Signal { name: "footerPositioningChanged"; revision: 2 } + Property { name: "headerPositioning"; revision: 4; type: "HeaderPositioning" } + Property { name: "footerPositioning"; revision: 4; type: "FooterPositioning" } + Signal { name: "headerPositioningChanged"; revision: 4 } + Signal { name: "footerPositioningChanged"; revision: 4 } Method { name: "incrementCurrentIndex" } Method { name: "decrementCurrentIndex" } } @@ -2952,13 +3018,13 @@ Module { "QtQuick/MouseArea 2.5", "QtQuick/MouseArea 2.9" ] - exportMetaObjectRevisions: [0, 1, 2, 9] + exportMetaObjectRevisions: [0, 4, 5, 9] Property { name: "mouseX"; type: "double"; isReadonly: true } Property { name: "mouseY"; type: "double"; isReadonly: true } Property { name: "containsMouse"; type: "bool"; isReadonly: true } Property { name: "pressed"; type: "bool"; isReadonly: true } Property { name: "enabled"; type: "bool" } - Property { name: "scrollGestureEnabled"; revision: 2; type: "bool" } + Property { name: "scrollGestureEnabled"; revision: 5; type: "bool" } Property { name: "pressedButtons"; type: "Qt::MouseButtons"; isReadonly: true } Property { name: "acceptedButtons"; type: "Qt::MouseButtons" } Property { name: "hoverEnabled"; type: "bool" } @@ -2966,10 +3032,10 @@ Module { Property { name: "preventStealing"; type: "bool" } Property { name: "propagateComposedEvents"; type: "bool" } Property { name: "cursorShape"; type: "Qt::CursorShape" } - Property { name: "containsPress"; revision: 1; type: "bool"; isReadonly: true } + Property { name: "containsPress"; revision: 4; type: "bool"; isReadonly: true } Property { name: "pressAndHoldInterval"; revision: 9; type: "int" } Signal { name: "hoveredChanged" } - Signal { name: "scrollGestureEnabledChanged"; revision: 2 } + Signal { name: "scrollGestureEnabledChanged"; revision: 5 } Signal { name: "positionChanged" Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true } @@ -3009,7 +3075,7 @@ Module { Signal { name: "entered" } Signal { name: "exited" } Signal { name: "canceled" } - Signal { name: "containsPressChanged"; revision: 1 } + Signal { name: "containsPressChanged"; revision: 4 } Signal { name: "pressAndHoldIntervalChanged"; revision: 9 } } Component { @@ -3172,13 +3238,21 @@ Module { name: "QQuickPath" defaultProperty: "pathElements" prototype: "QObject" - exports: ["QtQuick/Path 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/Path 2.0", "QtQuick/Path 2.14"] + exportMetaObjectRevisions: [0, 14] Property { name: "pathElements"; type: "QQuickPathElement"; isList: true; isReadonly: true } Property { name: "startX"; type: "double" } Property { name: "startY"; type: "double" } Property { name: "closed"; type: "bool"; isReadonly: true } + Property { name: "scale"; revision: 14; type: "QSizeF" } Signal { name: "changed" } + Signal { name: "scaleChanged"; revision: 14 } + Method { + name: "pointAtPercent" + revision: 14 + type: "QPointF" + Parameter { name: "t"; type: "double" } + } } Component { name: "QQuickPathAngleArc" @@ -3250,7 +3324,7 @@ Module { name: "QQuickPathArc" prototype: "QQuickCurve" exports: ["QtQuick/PathArc 2.0", "QtQuick/PathArc 2.9"] - exportMetaObjectRevisions: [0, 2] + exportMetaObjectRevisions: [0, 9] Enum { name: "ArcDirection" values: { @@ -3262,8 +3336,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 } + Property { name: "xAxisRotation"; revision: 9; type: "double" } + Signal { name: "xAxisRotationChanged"; revision: 9 } } Component { name: "QQuickPathAttribute" @@ -3322,6 +3396,14 @@ Module { exportMetaObjectRevisions: [0] } Component { + name: "QQuickPathMultiline" + prototype: "QQuickCurve" + exports: ["QtQuick/PathMultiline 2.14"] + exportMetaObjectRevisions: [0] + Property { name: "start"; type: "QPointF"; isReadonly: true } + Property { name: "paths"; type: "QVariantList" } + } + Component { name: "QQuickPathPercent" prototype: "QQuickPathElement" exports: ["QtQuick/PathPercent 2.0"] @@ -3329,6 +3411,14 @@ Module { Property { name: "value"; type: "double" } } Component { + name: "QQuickPathPolyline" + prototype: "QQuickCurve" + exports: ["QtQuick/PathPolyline 2.14"] + exportMetaObjectRevisions: [0] + Property { name: "start"; type: "QPointF"; isReadonly: true } + Property { name: "path"; type: "QVariantList" } + } + Component { name: "QQuickPathQuad" prototype: "QQuickCurve" exports: ["QtQuick/PathQuad 2.0"] @@ -3508,7 +3598,7 @@ Module { defaultProperty: "data" prototype: "QQuickItem" exports: ["QtQuick/PinchArea 2.0", "QtQuick/PinchArea 2.5"] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 5] Property { name: "enabled"; type: "bool" } Property { name: "pinch"; type: "QQuickPinch"; isReadonly: true; isPointer: true } Signal { @@ -3525,7 +3615,7 @@ Module { } Signal { name: "smartZoom" - revision: 1 + revision: 5 Parameter { name: "pinch"; type: "QQuickPinchEvent"; isPointer: true } } } @@ -3920,7 +4010,7 @@ Module { defaultProperty: "data" prototype: "QQuickItem" exports: ["QtQuick/ShaderEffect 2.0", "QtQuick/ShaderEffect 2.4"] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 4] Enum { name: "CullMode" values: { @@ -3944,7 +4034,7 @@ Module { Property { name: "cullMode"; type: "CullMode" } Property { name: "log"; type: "string"; isReadonly: true } Property { name: "status"; type: "Status"; isReadonly: true } - Property { name: "supportsAtlasTextures"; revision: 1; type: "bool" } + Property { name: "supportsAtlasTextures"; revision: 4; type: "bool" } } Component { name: "QQuickShaderEffectMesh" @@ -3963,7 +4053,7 @@ Module { "QtQuick/ShaderEffectSource 2.6", "QtQuick/ShaderEffectSource 2.9" ] - exportMetaObjectRevisions: [0, 1, 2] + exportMetaObjectRevisions: [0, 6, 9] Enum { name: "WrapMode" values: { @@ -3998,8 +4088,8 @@ Module { Property { name: "hideSource"; type: "bool" } Property { name: "mipmap"; type: "bool" } Property { name: "recursive"; type: "bool" } - Property { name: "textureMirroring"; revision: 1; type: "TextureMirroring" } - Property { name: "samples"; revision: 2; type: "int" } + Property { name: "textureMirroring"; revision: 6; type: "TextureMirroring" } + Property { name: "samples"; revision: 9; type: "int" } Signal { name: "scheduledUpdateCompleted" } Method { name: "scheduleUpdate" } } @@ -4011,11 +4101,11 @@ Module { "QtQuick/Shortcut 2.6", "QtQuick/Shortcut 2.9" ] - exportMetaObjectRevisions: [0, 1, 9] + exportMetaObjectRevisions: [0, 6, 9] Property { name: "sequence"; type: "QVariant" } Property { name: "sequences"; revision: 9; type: "QVariantList" } - Property { name: "nativeText"; revision: 1; type: "string"; isReadonly: true } - Property { name: "portableText"; revision: 1; type: "string"; isReadonly: true } + Property { name: "nativeText"; revision: 6; type: "string"; isReadonly: true } + Property { name: "portableText"; revision: 6; type: "string"; isReadonly: true } Property { name: "enabled"; type: "bool" } Property { name: "autoRepeat"; type: "bool" } Property { name: "context"; type: "Qt::ShortcutContext" } @@ -4229,7 +4319,7 @@ Module { exports: ["QtQuick/State 2.0"] exportMetaObjectRevisions: [0] Property { name: "name"; type: "string" } - Property { name: "when"; type: "QQmlBinding"; isPointer: true } + Property { name: "when"; type: "bool" } Property { name: "extend"; type: "string" } Property { name: "changes"; type: "QQuickStateOperation"; isList: true; isReadonly: true } Signal { name: "completed" } @@ -4340,8 +4430,8 @@ Module { name: "QQuickTableView" defaultProperty: "flickableData" prototype: "QQuickFlickable" - exports: ["QtQuick/TableView 2.12"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/TableView 2.12", "QtQuick/TableView 2.14"] + exportMetaObjectRevisions: [0, 14] attachedType: "QQuickTableViewAttached" Property { name: "rows"; type: "int"; isReadonly: true } Property { name: "columns"; type: "int"; isReadonly: true } @@ -4354,6 +4444,10 @@ Module { Property { name: "reuseItems"; type: "bool" } Property { name: "contentWidth"; type: "double" } Property { name: "contentHeight"; type: "double" } + Property { name: "syncView"; revision: 14; type: "QQuickTableView"; isPointer: true } + Property { name: "syncDirection"; revision: 14; type: "Qt::Orientations" } + Signal { name: "syncViewChanged"; revision: 14 } + Signal { name: "syncDirectionChanged"; revision: 14 } Method { name: "forceLayout" } } Component { @@ -4440,6 +4534,7 @@ Module { values: { "PlainText": 0, "RichText": 1, + "MarkdownText": 3, "AutoText": 2, "StyledText": 4 } @@ -4631,7 +4726,8 @@ Module { values: { "PlainText": 0, "RichText": 1, - "AutoText": 2 + "AutoText": 2, + "MarkdownText": 3 } } Enum { @@ -4892,7 +4988,7 @@ Module { "QtQuick/TextInput 2.7", "QtQuick/TextInput 2.9" ] - exportMetaObjectRevisions: [0, 2, 3, 6, 7, 9] + exportMetaObjectRevisions: [0, 2, 4, 6, 7, 9] Enum { name: "EchoMode" values: { @@ -4976,7 +5072,7 @@ Module { Property { name: "echoMode"; type: "EchoMode" } Property { name: "activeFocusOnPress"; type: "bool" } Property { name: "passwordCharacter"; type: "string" } - Property { name: "passwordMaskDelay"; revision: 3; type: "int" } + Property { name: "passwordMaskDelay"; revision: 4; type: "int" } Property { name: "displayText"; type: "string"; isReadonly: true } Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true } Property { name: "autoScroll"; type: "bool" } @@ -5036,7 +5132,7 @@ Module { } Signal { name: "passwordMaskDelayChanged" - revision: 3 + revision: 4 Parameter { name: "delay"; type: "int" } } Signal { name: "preeditTextChanged"; revision: 7 } @@ -5093,7 +5189,7 @@ Module { } Method { name: "ensureVisible" - revision: 3 + revision: 4 Parameter { name: "position"; type: "int" } } Method { name: "clear"; revision: 7 } @@ -5117,7 +5213,7 @@ Module { } Method { name: "inputMethodQuery" - revision: 3 + revision: 4 type: "QVariant" Parameter { name: "query"; type: "Qt::InputMethodQuery" } Parameter { name: "argument"; type: "QVariant" } @@ -5272,6 +5368,24 @@ Module { Property { name: "accepted"; type: "bool" } } Component { + name: "QQuickWheelHandler" + prototype: "QQuickSinglePointHandler" + exports: ["QtQuick/WheelHandler 2.14"] + exportMetaObjectRevisions: [0] + Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "invertible"; type: "bool" } + Property { name: "activeTimeout"; type: "double" } + Property { name: "rotation"; type: "double" } + Property { name: "rotationScale"; type: "double" } + Property { name: "property"; type: "string" } + Property { name: "targetScaleMultiplier"; type: "double" } + Property { name: "targetTransformAroundCursor"; type: "bool" } + Signal { + name: "wheel" + Parameter { name: "event"; type: "QQuickPointerScrollEvent"; isPointer: true } + } + } + Component { name: "QQuickWorkerScript" prototype: "QObject" exports: ["QtQuick/WorkerScript 2.0"] @@ -5279,7 +5393,7 @@ Module { Property { name: "source"; type: "QUrl" } Signal { name: "message" - Parameter { name: "messageObject"; type: "QQmlV4Handle" } + Parameter { name: "messageObject"; type: "QJSValue" } } Method { name: "sendMessage" @@ -5310,8 +5424,31 @@ Module { } } Component { + name: "QRegularExpressionValidator" + prototype: "QValidator" + exports: ["QtQuick/RegularExpressionValidator 2.14"] + exportMetaObjectRevisions: [0] + Property { name: "regularExpression"; type: "QRegularExpression" } + Signal { + name: "regularExpressionChanged" + Parameter { name: "re"; type: "QRegularExpression" } + } + Method { + name: "setRegularExpression" + Parameter { name: "re"; type: "QRegularExpression" } + } + } + Component { name: "QValidator" prototype: "QObject" + Enum { + name: "State" + values: { + "Invalid": 0, + "Intermediate": 1, + "Acceptable": 2 + } + } Signal { name: "changed" } } } |