diff options
author | Kai Koehne <kai.koehne@qt.io> | 2018-08-30 11:03:49 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2018-09-06 14:32:25 +0000 |
commit | 69984c9d36086428a3d43418af19d53db043a785 (patch) | |
tree | fd20ce11f2d65787fd5982150180b9de884985b9 /src | |
parent | 34c987cbd10971e4b5a00d08c6061b2f65967e56 (diff) |
Update plugins.qmltypes
by running
cd qtdeclarative/imports; for path in `find . -name Makefile -print`; do pushd `dirname $path`; make qmltypes; popd; done
in the build directory. Local file paths in the command line
were then edited out by hand.
Task-number: QTBUG-70264
Change-Id: I931604aff6a779915708395e8b8dbdf659cbd637
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
22 files changed, 501 insertions, 35 deletions
diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes index 53c5300685..f2179aaf7a 100644 --- a/src/imports/builtins/builtins.qmltypes +++ b/src/imports/builtins/builtins.qmltypes @@ -428,7 +428,8 @@ Module { "WA_AlwaysStackOnTop": 128, "WA_TabletTracking": 129, "WA_ContentsMarginsRespectsSafeArea": 130, - "WA_AttributeCount": 131 + "WA_StyleSheetTarget": 131, + "WA_AttributeCount": 132 } } Enum { @@ -1648,7 +1649,8 @@ Module { "NoScrollPhase": 0, "ScrollBegin": 1, "ScrollUpdate": 2, - "ScrollEnd": 3 + "ScrollEnd": 3, + "ScrollMomentum": 4 } } Enum { diff --git a/src/imports/folderlistmodel/plugins.qmltypes b/src/imports/folderlistmodel/plugins.qmltypes index a336b55022..cfa4765116 100644 --- a/src/imports/folderlistmodel/plugins.qmltypes +++ b/src/imports/folderlistmodel/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable Qt.labs.folderlistmodel 2.11' +// 'qmlplugindump -nonrelocatable Qt.labs.folderlistmodel 2.12' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.12"] Component { name: "QQuickFolderListModel" prototype: "QAbstractListModel" diff --git a/src/imports/labsmodels/plugins.qmltypes b/src/imports/labsmodels/plugins.qmltypes new file mode 100644 index 0000000000..606b8712da --- /dev/null +++ b/src/imports/labsmodels/plugins.qmltypes @@ -0,0 +1,41 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable Qt.labs.qmlmodels 1.0' + +Module { + dependencies: ["QtQuick 2.12"] + Component { + name: "QQmlAbstractDelegateComponent" + prototype: "QQmlComponent" + exports: ["Qt.labs.qmlmodels/AbstractDelegateComponent 1.0"] + isCreatable: false + exportMetaObjectRevisions: [0] + Signal { name: "delegateChanged" } + } + Component { + name: "QQmlDelegateChoice" + defaultProperty: "delegate" + prototype: "QObject" + exports: ["Qt.labs.qmlmodels/DelegateChoice 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "roleValue"; type: "QVariant" } + Property { name: "row"; type: "int" } + Property { name: "index"; type: "int" } + Property { name: "column"; type: "int" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "changed" } + } + Component { + name: "QQmlDelegateChooser" + defaultProperty: "choices" + prototype: "QQmlAbstractDelegateComponent" + exports: ["Qt.labs.qmlmodels/DelegateChooser 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "role"; type: "string" } + Property { name: "choices"; type: "QQmlDelegateChoice"; isList: true; isReadonly: true } + } +} diff --git a/src/imports/layouts/plugins.qmltypes b/src/imports/layouts/plugins.qmltypes index afb563391d..f8d7b9acfe 100644 --- a/src/imports/layouts/plugins.qmltypes +++ b/src/imports/layouts/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Layouts 1.3' +// 'qmlplugindump -nonrelocatable QtQuick.Layouts 1.12' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.12"] Component { name: "QQuickColumnLayout" defaultProperty: "data" diff --git a/src/imports/localstorage/dependencies.json b/src/imports/localstorage/dependencies.json new file mode 100644 index 0000000000..0d4f101c7a --- /dev/null +++ b/src/imports/localstorage/dependencies.json @@ -0,0 +1,2 @@ +[ +] diff --git a/src/imports/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes index 412989c001..59944328d6 100644 --- a/src/imports/localstorage/plugins.qmltypes +++ b/src/imports/localstorage/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 QtQuick.LocalStorage 2.11' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.LocalStorage 2.12' Module { dependencies: [] diff --git a/src/imports/models/dependencies.json b/src/imports/models/dependencies.json new file mode 100644 index 0000000000..0d4f101c7a --- /dev/null +++ b/src/imports/models/dependencies.json @@ -0,0 +1,2 @@ +[ +] diff --git a/src/imports/models/plugins.qmltypes b/src/imports/models/plugins.qmltypes index 60146f51ba..87ec0fee76 100644 --- a/src/imports/models/plugins.qmltypes +++ b/src/imports/models/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 QtQml.Models 2.11' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQml.Models 2.12' Module { dependencies: [] diff --git a/src/imports/particles/plugins.qmltypes b/src/imports/particles/plugins.qmltypes index 6c7c98cc71..b68be6c5da 100644 --- a/src/imports/particles/plugins.qmltypes +++ b/src/imports/particles/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Particles 2.0' +// 'qmlplugindump -nonrelocatable QtQuick.Particles 2.12' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.12"] Component { name: "QQuickAgeAffector" defaultProperty: "data" diff --git a/src/imports/qtqml/plugins.qmltypes b/src/imports/qtqml/plugins.qmltypes index caa04b04bb..1ffe4a78ca 100644 --- a/src/imports/qtqml/plugins.qmltypes +++ b/src/imports/qtqml/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 QtQml 2.3' +// 'qmlplugindump -nonrelocatable -noforceqtquick QtQml 2.12' Module { dependencies: [] @@ -96,7 +96,7 @@ Module { exports: ["QtQml/Connections 2.0", "QtQml/Connections 2.3"] exportMetaObjectRevisions: [0, 1] Property { name: "target"; type: "QObject"; isPointer: true } - Property { name: "enabled"; type: "bool" } + Property { name: "enabled"; revision: 1; type: "bool" } Property { name: "ignoreUnknownSignals"; type: "bool" } Signal { name: "enabledChanged"; revision: 1 } } @@ -240,5 +240,6 @@ Module { Property { name: "wasHeld"; type: "bool"; isReadonly: true } Property { name: "isClick"; type: "bool"; isReadonly: true } Property { name: "accepted"; type: "bool" } + Property { name: "flags"; revision: 11; type: "int"; isReadonly: true } } } diff --git a/src/imports/qtqml/qtqml.pro b/src/imports/qtqml/qtqml.pro index 283ba8f131..c00172ddc4 100644 --- a/src/imports/qtqml/qtqml.pro +++ b/src/imports/qtqml/qtqml.pro @@ -7,6 +7,6 @@ load(qml_module) !cross_compile:if(build_pass|!debug_and_release) { qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) - qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable QtQml 2.$$QT_MINOR_VERSION > $$PWD/plugins.qmltypes + qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable -noforceqtquick QtQml 2.$$QT_MINOR_VERSION > $$PWD/plugins.qmltypes QMAKE_EXTRA_TARGETS += qmltypes } diff --git a/src/imports/qtquick2/dependencies.json b/src/imports/qtquick2/dependencies.json new file mode 100644 index 0000000000..0d4f101c7a --- /dev/null +++ b/src/imports/qtquick2/dependencies.json @@ -0,0 +1,2 @@ +[ +] diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes index 6f6f1de8c3..456db6316e 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 QtQuick 2.11' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick 2.12' Module { dependencies: [] @@ -742,9 +742,9 @@ Module { Component { name: "QQuickAbstractAnimation" prototype: "QObject" - exports: ["QtQuick/Animation 2.0"] + exports: ["QtQuick/Animation 2.0", "QtQuick/Animation 2.12"] isCreatable: false - exportMetaObjectRevisions: [0] + exportMetaObjectRevisions: [0, 12] Enum { name: "Loops" values: { @@ -773,6 +773,7 @@ Module { name: "loopCountChanged" Parameter { type: "int" } } + Signal { name: "finished"; revision: 12 } Method { name: "restart" } Method { name: "start" } Method { name: "pause" } @@ -960,8 +961,8 @@ Module { name: "QQuickAnimatedSprite" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtQuick/AnimatedSprite 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/AnimatedSprite 2.0", "QtQuick/AnimatedSprite 2.12"] + exportMetaObjectRevisions: [0, 12] Enum { name: "LoopParameters" values: { @@ -1043,6 +1044,7 @@ Module { name: "currentFrameChanged" Parameter { name: "arg"; type: "int" } } + Signal { name: "finished"; revision: 12 } Method { name: "start" } Method { name: "stop" } Method { name: "restart" } @@ -1448,6 +1450,25 @@ Module { Method { name: "drop"; type: "int" } } Component { + name: "QQuickDragAxis" + prototype: "QObject" + exports: ["QtQuick/DragAxis 2.12"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "minimum"; type: "double" } + Property { name: "maximum"; type: "double" } + Property { name: "enabled"; type: "bool" } + } + Component { + name: "QQuickDragHandler" + prototype: "QQuickMultiPointHandler" + exports: ["QtQuick/DragHandler 2.12"] + exportMetaObjectRevisions: [0] + 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 } + } + Component { name: "QQuickDropArea" defaultProperty: "data" prototype: "QQuickItem" @@ -1525,15 +1546,66 @@ Module { Property { name: "type"; type: "Qt::EnterKeyType" } } Component { + name: "QQuickEventPoint" + prototype: "QObject" + exports: ["QtQuick/EventPoint 2.12"] + isCreatable: false + exportMetaObjectRevisions: [0] + Enum { + name: "States" + values: { + "Pressed": 1, + "Updated": 2, + "Stationary": 4, + "Released": 8 + } + } + Enum { + name: "GrabTransition" + values: { + "GrabPassive": 1, + "UngrabPassive": 2, + "CancelGrabPassive": 3, + "OverrideGrabPassive": 4, + "GrabExclusive": 16, + "UngrabExclusive": 32, + "CancelGrabExclusive": 48 + } + } + Property { name: "event"; type: "QQuickPointerEvent"; isReadonly: true; isPointer: true } + Property { name: "position"; type: "QPointF"; isReadonly: true } + Property { name: "scenePosition"; type: "QPointF"; isReadonly: true } + Property { name: "scenePressPosition"; type: "QPointF"; isReadonly: true } + Property { name: "sceneGrabPosition"; type: "QPointF"; isReadonly: true } + Property { name: "state"; type: "State"; isReadonly: true } + Property { name: "pointId"; type: "int"; isReadonly: true } + Property { name: "timeHeld"; type: "double"; isReadonly: true } + Property { name: "velocity"; type: "QVector2D"; isReadonly: true } + Property { name: "accepted"; type: "bool" } + Property { name: "exclusiveGrabber"; type: "QObject"; isPointer: true } + } + Component { + name: "QQuickEventTouchPoint" + prototype: "QQuickEventPoint" + exports: ["QtQuick/EventTouchPoint 2.12"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "rotation"; type: "double"; isReadonly: true } + Property { name: "pressure"; type: "double"; isReadonly: true } + Property { name: "ellipseDiameters"; type: "QSizeF"; isReadonly: true } + Property { name: "uniqueId"; type: "QPointingDeviceUniqueId"; isReadonly: true } + } + Component { name: "QQuickFlickable" defaultProperty: "flickableData" prototype: "QQuickItem" exports: [ "QtQuick/Flickable 2.0", "QtQuick/Flickable 2.10", + "QtQuick/Flickable 2.12", "QtQuick/Flickable 2.9" ] - exportMetaObjectRevisions: [0, 10, 9] + exportMetaObjectRevisions: [0, 10, 12, 9] Enum { name: "BoundsBehavior" values: { @@ -1600,6 +1672,7 @@ Module { isPointer: true } Property { name: "pixelAligned"; type: "bool" } + Property { name: "synchronousDrag"; revision: 12; type: "bool" } Property { name: "horizontalOvershoot"; revision: 9; type: "double"; isReadonly: true } Property { name: "verticalOvershoot"; revision: 9; type: "double"; isReadonly: true } Property { name: "flickableData"; type: "QObject"; isList: true; isReadonly: true } @@ -1612,8 +1685,13 @@ Module { Signal { name: "flickEnded" } Signal { name: "dragStarted" } Signal { name: "dragEnded" } + Signal { name: "synchronousDragChanged"; revision: 12 } Signal { name: "horizontalOvershootChanged"; revision: 9 } Signal { name: "verticalOvershootChanged"; revision: 9 } + Signal { name: "atXEndChanged"; revision: 12 } + Signal { name: "atYEndChanged"; revision: 12 } + Signal { name: "atXBeginningChanged"; revision: 12 } + Signal { name: "atYBeginningChanged"; revision: 12 } Method { name: "resizeContent" Parameter { name: "w"; type: "double" } @@ -1836,9 +1914,17 @@ Module { name: "QQuickGradient" defaultProperty: "stops" prototype: "QObject" - exports: ["QtQuick/Gradient 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/Gradient 2.0", "QtQuick/Gradient 2.12"] + exportMetaObjectRevisions: [0, 12] + Enum { + name: "Orientation" + values: { + "Vertical": 2, + "Horizontal": 1 + } + } Property { name: "stops"; type: "QQuickGradientStop"; isList: true; isReadonly: true } + Property { name: "orientation"; revision: 12; type: "Orientation" } Signal { name: "updated" } } Component { @@ -2017,6 +2103,13 @@ Module { } Component { name: "QQuickGridViewAttached"; prototype: "QQuickItemViewAttached" } Component { + name: "QQuickHoverHandler" + prototype: "QQuickSinglePointHandler" + exports: ["QtQuick/HoverHandler 2.12"] + exportMetaObjectRevisions: [0] + Property { name: "hovered"; type: "bool"; isReadonly: true } + } + Component { name: "QQuickImage" defaultProperty: "data" prototype: "QQuickImageBase" @@ -2890,6 +2983,14 @@ Module { Signal { name: "pressAndHoldIntervalChanged"; revision: 9 } } Component { + name: "QQuickMultiPointHandler" + prototype: "QQuickPointerDeviceHandler" + Property { name: "minimumPointCount"; type: "int" } + Property { name: "maximumPointCount"; type: "int" } + Property { name: "centroid"; type: "QQuickHandlerPoint"; isReadonly: true } + Signal { name: "marginChanged" } + } + Component { name: "QQuickMultiPointTouchArea" defaultProperty: "data" prototype: "QQuickItem" @@ -3401,6 +3502,213 @@ Module { Property { name: "accepted"; type: "bool" } } Component { + name: "QQuickPinchHandler" + prototype: "QQuickMultiPointHandler" + exports: ["QtQuick/PinchHandler 2.12"] + exportMetaObjectRevisions: [0] + Property { name: "minimumScale"; type: "double" } + Property { name: "maximumScale"; type: "double" } + Property { name: "minimumRotation"; type: "double" } + Property { name: "maximumRotation"; type: "double" } + Property { name: "scale"; type: "double"; isReadonly: true } + Property { name: "activeScale"; type: "double"; isReadonly: true } + Property { name: "rotation"; type: "double"; isReadonly: true } + Property { name: "translation"; type: "QVector2D"; isReadonly: true } + Property { name: "minimumX"; type: "double" } + Property { name: "maximumX"; type: "double" } + Property { name: "minimumY"; type: "double" } + Property { name: "maximumY"; type: "double" } + Property { name: "xAxis"; type: "QQuickDragAxis"; isReadonly: true; isPointer: true } + Property { name: "yAxis"; type: "QQuickDragAxis"; isReadonly: true; isPointer: true } + Signal { name: "updated" } + } + Component { + name: "QQuickPointHandler" + prototype: "QQuickSinglePointHandler" + exports: ["QtQuick/PointHandler 2.12"] + exportMetaObjectRevisions: [0] + Property { name: "translation"; type: "QVector2D"; isReadonly: true } + } + Component { + name: "QQuickPointerDevice" + prototype: "QObject" + exports: ["QtQuick/PointerDevice 2.12"] + isCreatable: false + exportMetaObjectRevisions: [0] + Enum { + name: "DeviceType" + values: { + "UnknownDevice": 0, + "Mouse": 1, + "TouchScreen": 2, + "TouchPad": 4, + "Puck": 8, + "Stylus": 16, + "Airbrush": 32, + "AllDevices": 32767 + } + } + Enum { + name: "DeviceTypes" + values: { + "UnknownDevice": 0, + "Mouse": 1, + "TouchScreen": 2, + "TouchPad": 4, + "Puck": 8, + "Stylus": 16, + "Airbrush": 32, + "AllDevices": 32767 + } + } + Enum { + name: "PointerType" + values: { + "GenericPointer": 1, + "Finger": 2, + "Pen": 4, + "Eraser": 8, + "Cursor": 16, + "AllPointerTypes": 32767 + } + } + Enum { + name: "PointerTypes" + values: { + "GenericPointer": 1, + "Finger": 2, + "Pen": 4, + "Eraser": 8, + "Cursor": 16, + "AllPointerTypes": 32767 + } + } + Enum { + name: "CapabilityFlag" + values: { + "Position": 1, + "Area": 2, + "Pressure": 4, + "Velocity": 8, + "MouseEmulation": 64, + "Scroll": 256, + "Hover": 512, + "Rotation": 1024, + "XTilt": 2048, + "YTilt": 4096 + } + } + Enum { + name: "Capabilities" + values: { + "Position": 1, + "Area": 2, + "Pressure": 4, + "Velocity": 8, + "MouseEmulation": 64, + "Scroll": 256, + "Hover": 512, + "Rotation": 1024, + "XTilt": 2048, + "YTilt": 4096 + } + } + Property { name: "type"; type: "DeviceType"; isReadonly: true } + Property { name: "pointerType"; type: "PointerType"; isReadonly: true } + Property { name: "capabilities"; type: "Capabilities"; isReadonly: true } + Property { name: "maximumTouchPoints"; type: "int"; isReadonly: true } + Property { name: "buttonCount"; type: "int"; isReadonly: true } + Property { name: "name"; type: "string"; isReadonly: true } + Property { name: "uniqueId"; type: "QPointingDeviceUniqueId"; isReadonly: true } + } + Component { + name: "QQuickPointerDeviceHandler" + prototype: "QQuickPointerHandler" + Property { name: "acceptedDevices"; type: "QQuickPointerDevice::DeviceTypes" } + Property { name: "acceptedPointerTypes"; type: "QQuickPointerDevice::PointerTypes" } + Property { name: "acceptedButtons"; type: "Qt::MouseButtons" } + Property { name: "acceptedModifiers"; type: "Qt::KeyboardModifiers" } + Method { + name: "setAcceptedDevices" + Parameter { name: "acceptedDevices"; type: "QQuickPointerDevice::DeviceTypes" } + } + Method { + name: "setAcceptedPointerTypes" + Parameter { name: "acceptedPointerTypes"; type: "QQuickPointerDevice::PointerTypes" } + } + Method { + name: "setAcceptedButtons" + Parameter { name: "buttons"; type: "Qt::MouseButtons" } + } + Method { + name: "setAcceptedModifiers" + Parameter { name: "acceptedModifiers"; type: "Qt::KeyboardModifiers" } + } + } + Component { + name: "QQuickPointerEvent" + prototype: "QObject" + exports: ["QtQuick/PointerEvent 2.12"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "device"; type: "QQuickPointerDevice"; isReadonly: true; isPointer: true } + Property { name: "modifiers"; type: "Qt::KeyboardModifiers"; isReadonly: true } + Property { name: "button"; type: "Qt::MouseButtons"; isReadonly: true } + Property { name: "buttons"; type: "Qt::MouseButtons"; isReadonly: true } + } + Component { + name: "QQuickPointerHandler" + prototype: "QObject" + exports: ["QtQuick/PointerHandler 2.12"] + isCreatable: false + exportMetaObjectRevisions: [0] + Enum { + name: "GrabPermissions" + values: { + "TakeOverForbidden": 0, + "CanTakeOverFromHandlersOfSameType": 1, + "CanTakeOverFromHandlersOfDifferentType": 2, + "CanTakeOverFromItems": 4, + "CanTakeOverFromAnything": 15, + "ApprovesTakeOverByHandlersOfSameType": 16, + "ApprovesTakeOverByHandlersOfDifferentType": 32, + "ApprovesTakeOverByItems": 64, + "ApprovesCancellation": 128, + "ApprovesTakeOverByAnything": 240 + } + } + Property { name: "enabled"; type: "bool" } + Property { name: "active"; type: "bool"; isReadonly: true } + Property { name: "target"; type: "QQuickItem"; isPointer: true } + Property { name: "parent"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "grabPermissions"; type: "GrabPermissions" } + Property { name: "margin"; type: "double" } + Signal { + name: "grabChanged" + Parameter { name: "transition"; type: "QQuickEventPoint::GrabTransition" } + Parameter { name: "point"; type: "QQuickEventPoint"; isPointer: true } + } + Signal { name: "grabPermissionChanged" } + Signal { + name: "canceled" + Parameter { name: "point"; type: "QQuickEventPoint"; isPointer: true } + } + } + Component { + name: "QQuickPointerMouseEvent" + prototype: "QQuickSinglePointEvent" + exports: ["QtQuick/PointerMouseEvent 2.12"] + isCreatable: false + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickPointerTouchEvent" + prototype: "QQuickPointerEvent" + exports: ["QtQuick/PointerTouchEvent 2.12"] + isCreatable: false + exportMetaObjectRevisions: [0] + } + Component { name: "QQuickPositionerAttached" prototype: "QObject" Property { name: "index"; type: "int"; isReadonly: true } @@ -3470,7 +3778,7 @@ Module { exports: ["QtQuick/Rectangle 2.0"] exportMetaObjectRevisions: [0] Property { name: "color"; type: "QColor" } - Property { name: "gradient"; type: "QQuickGradient"; isPointer: true } + Property { name: "gradient"; type: "QJSValue" } Property { name: "border"; type: "QQuickPen"; isReadonly: true; isPointer: true } Property { name: "radius"; type: "double" } } @@ -3580,6 +3888,10 @@ Module { Property { name: "right"; type: "int" } Property { name: "bottom"; type: "int" } Signal { name: "borderChanged" } + Signal { name: "leftBorderChanged" } + Signal { name: "topBorderChanged" } + Signal { name: "rightBorderChanged" } + Signal { name: "bottomBorderChanged" } } Component { name: "QQuickScriptAction" @@ -3704,6 +4016,12 @@ Module { Signal { name: "activated" } Signal { name: "activatedAmbiguously" } } + Component { name: "QQuickSinglePointEvent"; prototype: "QQuickPointerEvent" } + Component { + name: "QQuickSinglePointHandler" + prototype: "QQuickPointerDeviceHandler" + Property { name: "point"; type: "QQuickHandlerPoint"; isReadonly: true } + } Component { name: "QQuickSmoothedAnimation" prototype: "QQuickNumberAnimation" @@ -4012,18 +4330,84 @@ Module { Signal { name: "paletteChanged" } } Component { + name: "QQuickTableView" + defaultProperty: "flickableData" + prototype: "QQuickFlickable" + exports: ["QtQuick/TableView 2.12"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickTableViewAttached" + Property { name: "rows"; type: "int"; isReadonly: true } + Property { name: "columns"; type: "int"; isReadonly: true } + Property { name: "rowSpacing"; type: "double" } + Property { name: "columnSpacing"; type: "double" } + Property { name: "topMargin"; type: "double" } + Property { name: "bottomMargin"; type: "double" } + Property { name: "leftMargin"; type: "double" } + Property { name: "rightMargin"; type: "double" } + Property { name: "rowHeightProvider"; type: "QJSValue" } + Property { name: "columnWidthProvider"; type: "QJSValue" } + Property { name: "model"; type: "QVariant" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "reuseItems"; type: "bool" } + Property { name: "contentWidth"; type: "double" } + Property { name: "contentHeight"; type: "double" } + Signal { name: "contentWidthOverrideChanged" } + Signal { name: "contentHeightOverrideChanged" } + Method { name: "forceLayout" } + } + Component { + name: "QQuickTableViewAttached" + prototype: "QObject" + Property { name: "view"; type: "QQuickTableView"; isReadonly: true; isPointer: true } + Signal { name: "pooled" } + Signal { name: "reused" } + } + Component { + name: "QQuickTapHandler" + prototype: "QQuickSinglePointHandler" + exports: ["QtQuick/TapHandler 2.12"] + exportMetaObjectRevisions: [0] + Enum { + name: "GesturePolicy" + values: { + "DragThreshold": 0, + "WithinBounds": 1, + "ReleaseWithinBounds": 2 + } + } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "tapCount"; type: "int"; isReadonly: true } + Property { name: "timeHeld"; type: "double"; isReadonly: true } + Property { name: "longPressThreshold"; type: "double" } + Property { name: "gesturePolicy"; type: "GesturePolicy" } + Signal { + name: "tapped" + Parameter { name: "eventPoint"; type: "QQuickEventPoint"; isPointer: true } + } + Signal { + name: "singleTapped" + Parameter { name: "eventPoint"; type: "QQuickEventPoint"; isPointer: true } + } + Signal { + name: "doubleTapped" + Parameter { name: "eventPoint"; type: "QQuickEventPoint"; isPointer: true } + } + Signal { name: "longPressed" } + } + Component { name: "QQuickText" defaultProperty: "data" prototype: "QQuickImplicitSizeItem" exports: [ "QtQuick/Text 2.0", "QtQuick/Text 2.10", + "QtQuick/Text 2.12", "QtQuick/Text 2.2", "QtQuick/Text 2.3", "QtQuick/Text 2.6", "QtQuick/Text 2.9" ] - exportMetaObjectRevisions: [0, 10, 2, 3, 6, 9] + exportMetaObjectRevisions: [0, 10, 12, 2, 3, 6, 9] Enum { name: "HAlignment" values: { @@ -4174,6 +4558,16 @@ Module { } Signal { name: "contentSizeChanged" } Signal { + name: "contentWidthChanged" + revision: 12 + Parameter { name: "contentWidth"; type: "double" } + } + Signal { + name: "contentHeightChanged" + revision: 12 + Parameter { name: "contentHeight"; type: "double" } + } + Signal { name: "lineHeightChanged" Parameter { name: "lineHeight"; type: "double" } } diff --git a/src/imports/settings/dependencies.json b/src/imports/settings/dependencies.json new file mode 100644 index 0000000000..0d4f101c7a --- /dev/null +++ b/src/imports/settings/dependencies.json @@ -0,0 +1,2 @@ +[ +] diff --git a/src/imports/settings/plugins.qmltypes b/src/imports/settings/plugins.qmltypes index ae3de3dfff..1d69fcf7e9 100644 --- a/src/imports/settings/plugins.qmltypes +++ b/src/imports/settings/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 Qt.labs.settings 1.1' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt.labs.settings 1.1' Module { dependencies: [] @@ -18,6 +18,24 @@ Module { exportMetaObjectRevisions: [0, 1] Property { name: "category"; type: "string" } Property { name: "fileName"; revision: 1; type: "string" } + Method { + name: "value" + revision: 1 + type: "QVariant" + Parameter { name: "key"; type: "string" } + Parameter { name: "defaultValue"; type: "QVariant" } + } + Method { + name: "value" + revision: 1 + type: "QVariant" + Parameter { name: "key"; type: "string" } + } + Method { + name: "setValue" + revision: 1 + Parameter { name: "key"; type: "string" } + Parameter { name: "value"; type: "QVariant" } + } } } - diff --git a/src/imports/shapes/plugins.qmltypes b/src/imports/shapes/plugins.qmltypes index a140644d6d..a851b20ed2 100644 --- a/src/imports/shapes/plugins.qmltypes +++ b/src/imports/shapes/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Shapes 1.11' +// 'qmlplugindump -nonrelocatable QtQuick.Shapes 1.12' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.12"] Component { name: "QQuickShape" defaultProperty: "data" diff --git a/src/imports/sharedimage/plugins.qmltypes b/src/imports/sharedimage/plugins.qmltypes index 46fa24df1a..504186936b 100644 --- a/src/imports/sharedimage/plugins.qmltypes +++ b/src/imports/sharedimage/plugins.qmltypes @@ -7,5 +7,5 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable Qt.labs.sharedimage 1.0' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.12"] } diff --git a/src/imports/statemachine/dependencies.json b/src/imports/statemachine/dependencies.json new file mode 100644 index 0000000000..0d4f101c7a --- /dev/null +++ b/src/imports/statemachine/dependencies.json @@ -0,0 +1,2 @@ +[ +] diff --git a/src/imports/statemachine/plugins.qmltypes b/src/imports/statemachine/plugins.qmltypes index e6ecaa75c8..001efd3847 100644 --- a/src/imports/statemachine/plugins.qmltypes +++ b/src/imports/statemachine/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 QtQml.StateMachine 1.11' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQml.StateMachine 1.12' Module { dependencies: [] diff --git a/src/imports/testlib/plugins.qmltypes b/src/imports/testlib/plugins.qmltypes index 7f3140d86b..56b4ecf662 100644 --- a/src/imports/testlib/plugins.qmltypes +++ b/src/imports/testlib/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 QtTest 1.2' +// 'qmlplugindump -nonrelocatable QtTest 1.12' Module { dependencies: ["QtQuick 2.0", "QtQuick.Window 2.0"] @@ -269,7 +269,7 @@ Module { } Method { name: "ignoreWarning" - Parameter { name: "message"; type: "string" } + Parameter { name: "message"; type: "QJSValue" } } Method { name: "wait" diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes index 4815be7262..8ecb09968c 100644 --- a/src/imports/window/plugins.qmltypes +++ b/src/imports/window/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Window 2.11' +// 'qmlplugindump -nonrelocatable QtQuick.Window 2.12' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.12"] Component { name: "QQuickRootItem" defaultProperty: "data" diff --git a/src/imports/xmllistmodel/plugins.qmltypes b/src/imports/xmllistmodel/plugins.qmltypes index cc675d5f83..951d0b6eeb 100644 --- a/src/imports/xmllistmodel/plugins.qmltypes +++ b/src/imports/xmllistmodel/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.0' +// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.12' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.12"] Component { name: "QQuickXmlListModel" defaultProperty: "roles" |