diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-24 09:11:14 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-24 08:38:56 +0000 |
commit | f1abe03ce932ac3f2967c750c4dc1cfd2a9a6273 (patch) | |
tree | e678ea0694907100b9ee502bb5cf1c970a73c5d3 | |
parent | b367176c5987d62409fc9105a53ebbc99bf84f32 (diff) |
Update plugins.qmltypes
Change-Id: Ic16c8e0796178bd99fc7dd8c965c0ed1de8da9d3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r-- | src/imports/controls/plugins.qmltypes | 213 | ||||
-rw-r--r-- | src/imports/templates/plugins.qmltypes | 182 |
2 files changed, 309 insertions, 86 deletions
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index de4e26f8..c3e01172 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -4,22 +4,31 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.1 -merge ../templates/plugins.qmltypes -dependencies dependencies.json' +// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.2 -merge ../templates/plugins.qmltypes -dependencies dependencies.json' Module { dependencies: [ - "QtQuick 2.8", - "QtQuick.Templates 2.1", + "QtQuick 2.9", + "QtQuick.Templates 2.2", "QtQuick.Window 2.2" ] Component { - name: "QQuickBusyIndicatorRing" + name: "QQuickDefaultBusyIndicator" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtQuick.Controls.impl/BusyRing 2.0"] + exports: ["QtQuick.Controls.impl/BusyIndicatorImpl 2.0"] exportMetaObjectRevisions: [0] } Component { + name: "QQuickDefaultProgressBar" + defaultProperty: "data" + prototype: "QQuickItem" + exports: ["QtQuick.Controls.impl/ProgressBarImpl 2.0"] + exportMetaObjectRevisions: [0] + Property { name: "indeterminate"; type: "bool" } + Property { name: "progress"; type: "double" } + } + Component { name: "QQuickDefaultStyle" prototype: "QObject" exports: ["QtQuick.Controls.impl/Default 2.1"] @@ -76,13 +85,11 @@ Module { Property { name: "color"; type: "QColor" } } Component { - name: "QQuickProgressStrip" + name: "QQuickPlaceholderText" defaultProperty: "data" - prototype: "QQuickItem" - exports: ["QtQuick.Controls.impl/ProgressStrip 2.0"] + prototype: "QQuickText" + exports: ["QtQuick.Controls.impl/PlaceholderText 2.2"] exportMetaObjectRevisions: [0] - Property { name: "indeterminate"; type: "bool" } - Property { name: "progress"; type: "double" } } Component { name: "QQuickTumblerView" @@ -176,6 +183,14 @@ Module { defaultProperty: "data" } Component { + prototype: "QQuickDelayButton" + name: "QtQuick.Controls/DelayButton 2.2" + exports: ["QtQuick.Controls/DelayButton 2.2"] + exportMetaObjectRevisions: [2] + isComposite: true + defaultProperty: "data" + } + Component { prototype: "QQuickDial" name: "QtQuick.Controls/Dial 2.0" exports: ["QtQuick.Controls/Dial 2.0"] @@ -515,6 +530,7 @@ Module { Signal { name: "released" } Signal { name: "canceled" } Signal { name: "clicked" } + Signal { name: "toggled"; revision: 2 } Signal { name: "pressAndHold" } Signal { name: "doubleClicked" } Method { name: "toggle" } @@ -618,23 +634,38 @@ Module { prototype: "QQuickControl" exports: [ "QtQuick.Templates/ComboBox 2.0", - "QtQuick.Templates/ComboBox 2.1" + "QtQuick.Templates/ComboBox 2.1", + "QtQuick.Templates/ComboBox 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] Property { name: "count"; type: "int"; isReadonly: true } Property { name: "model"; type: "QVariant" } Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true } + Property { name: "editable"; revision: 2; type: "bool" } Property { name: "flat"; revision: 1; type: "bool" } + Property { name: "down"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "highlightedIndex"; type: "int"; isReadonly: true } Property { name: "currentIndex"; type: "int" } Property { name: "currentText"; type: "string"; isReadonly: true } Property { name: "displayText"; type: "string" } + Property { name: "editText"; revision: 2; type: "string" } Property { name: "textRole"; type: "string" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "indicator"; type: "QQuickItem"; isPointer: true } Property { name: "popup"; type: "QQuickPopup"; isPointer: true } + Property { name: "validator"; revision: 2; type: "QValidator"; isPointer: true } + Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" } + Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true } + Property { name: "acceptableInput"; revision: 2; type: "bool"; isReadonly: true } + Signal { name: "editableChanged"; revision: 2 } Signal { name: "flatChanged"; revision: 1 } + Signal { name: "downChanged"; revision: 2 } + Signal { name: "editTextChanged"; revision: 2 } + Signal { name: "validatorChanged"; revision: 2 } + Signal { name: "inputMethodHintsChanged"; revision: 2 } + Signal { name: "inputMethodComposingChanged"; revision: 2 } + Signal { name: "acceptableInputChanged"; revision: 2 } Signal { name: "activated" Parameter { name: "index"; type: "int" } @@ -643,8 +674,10 @@ Module { name: "highlighted" Parameter { name: "index"; type: "int" } } + Signal { name: "accepted"; revision: 2 } Method { name: "incrementCurrentIndex" } Method { name: "decrementCurrentIndex" } + Method { name: "selectAll"; revision: 2 } Method { name: "textAt" type: "string" @@ -734,11 +767,22 @@ Module { Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } } Component { + name: "QQuickDelayButton" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["QtQuick.Templates/DelayButton 2.2"] + exportMetaObjectRevisions: [0] + Property { name: "delay"; type: "int" } + Property { name: "progress"; type: "double" } + Property { name: "transition"; type: "QQuickTransition"; isPointer: true } + Signal { name: "activated" } + } + Component { name: "QQuickDial" defaultProperty: "data" prototype: "QQuickControl" - exports: ["QtQuick.Templates/Dial 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick.Templates/Dial 2.0", "QtQuick.Templates/Dial 2.2"] + exportMetaObjectRevisions: [0, 2] Enum { name: "SnapMode" values: { @@ -756,7 +800,10 @@ Module { Property { name: "snapMode"; type: "SnapMode" } Property { name: "wrap"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "live"; revision: 2; type: "bool" } Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Signal { name: "liveChanged"; revision: 2 } + Signal { name: "moved"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } } @@ -816,11 +863,16 @@ Module { name: "QQuickDrawer" defaultProperty: "contentData" prototype: "QQuickPopup" - exports: ["QtQuick.Templates/Drawer 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQuick.Templates/Drawer 2.0", + "QtQuick.Templates/Drawer 2.2" + ] + exportMetaObjectRevisions: [0, 2] Property { name: "edge"; type: "Qt::Edge" } Property { name: "position"; type: "double" } Property { name: "dragMargin"; type: "double" } + Property { name: "interactive"; revision: 2; type: "bool" } + Signal { name: "interactiveChanged"; revision: 2 } } Component { name: "QQuickFrame" @@ -1076,9 +1128,10 @@ Module { prototype: "QQuickControl" exports: [ "QtQuick.Templates/RangeSlider 2.0", - "QtQuick.Templates/RangeSlider 2.1" + "QtQuick.Templates/RangeSlider 2.1", + "QtQuick.Templates/RangeSlider 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "SnapMode" values: { @@ -1094,6 +1147,8 @@ Module { Property { name: "stepSize"; type: "double" } Property { name: "snapMode"; type: "SnapMode" } Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "live"; revision: 2; type: "bool" } + Signal { name: "liveChanged"; revision: 2 } Method { name: "setValues" Parameter { name: "firstValue"; type: "double" } @@ -1125,15 +1180,40 @@ Module { name: "QQuickScrollBar" defaultProperty: "data" prototype: "QQuickControl" - exports: ["QtQuick.Templates/ScrollBar 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQuick.Templates/ScrollBar 2.0", + "QtQuick.Templates/ScrollBar 2.2" + ] + exportMetaObjectRevisions: [0, 2] attachedType: "QQuickScrollBarAttached" + Enum { + name: "SnapMode" + values: { + "NoSnap": 0, + "SnapAlways": 1, + "SnapOnRelease": 2 + } + } + Enum { + name: "Policy" + values: { + "AsNeeded": 0, + "AlwaysOff": 1, + "AlwaysOn": 2 + } + } Property { name: "size"; type: "double" } Property { name: "position"; type: "double" } Property { name: "stepSize"; type: "double" } Property { name: "active"; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "snapMode"; revision: 2; type: "SnapMode" } + Property { name: "interactive"; revision: 2; type: "bool" } + Property { name: "policy"; revision: 2; type: "Policy" } + Signal { name: "snapModeChanged"; revision: 2 } + Signal { name: "interactiveChanged"; revision: 2 } + Signal { name: "policyChanged"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -1183,9 +1263,10 @@ Module { prototype: "QQuickControl" exports: [ "QtQuick.Templates/Slider 2.0", - "QtQuick.Templates/Slider 2.1" + "QtQuick.Templates/Slider 2.1", + "QtQuick.Templates/Slider 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "SnapMode" values: { @@ -1201,9 +1282,12 @@ Module { Property { name: "visualPosition"; type: "double"; isReadonly: true } Property { name: "stepSize"; type: "double" } Property { name: "snapMode"; type: "SnapMode" } + Property { name: "live"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "orientation"; type: "Qt::Orientation" } Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Signal { name: "liveChanged"; revision: 2 } + Signal { name: "moved"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -1219,9 +1303,10 @@ Module { prototype: "QQuickControl" exports: [ "QtQuick.Templates/SpinBox 2.0", - "QtQuick.Templates/SpinBox 2.1" + "QtQuick.Templates/SpinBox 2.1", + "QtQuick.Templates/SpinBox 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] Property { name: "from"; type: "int" } Property { name: "to"; type: "int" } Property { name: "value"; type: "int" } @@ -1232,6 +1317,11 @@ Module { Property { name: "valueFromText"; type: "QJSValue" } Property { name: "up"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true } Property { name: "down"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true } + Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" } + Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true } + Signal { name: "valueModified"; revision: 2 } + Signal { name: "inputMethodHintsChanged"; revision: 2 } + Signal { name: "inputMethodComposingChanged"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } } @@ -1244,18 +1334,6 @@ Module { Signal { name: "hoveredChanged"; revision: 1 } } Component { - name: "QQuickStackAttached" - prototype: "QObject" - Property { name: "index"; type: "int"; isReadonly: true } - Property { name: "view"; type: "QQuickStackView"; isReadonly: true; isPointer: true } - Property { name: "status"; type: "QQuickStackView::Status"; isReadonly: true } - Signal { name: "activated" } - Signal { name: "activating" } - Signal { name: "deactivated" } - Signal { name: "deactivating" } - Signal { name: "removed" } - } - Component { name: "QQuickStackView" defaultProperty: "data" prototype: "QQuickControl" @@ -1264,7 +1342,7 @@ Module { "QtQuick.Templates/StackView 2.1" ] exportMetaObjectRevisions: [0, 1] - attachedType: "QQuickStackAttached" + attachedType: "QQuickStackViewAttached" Enum { name: "Status" values: { @@ -1338,17 +1416,39 @@ Module { } } Component { + name: "QQuickStackViewAttached" + prototype: "QObject" + Property { name: "index"; type: "int"; isReadonly: true } + Property { name: "view"; type: "QQuickStackView"; isReadonly: true; isPointer: true } + Property { name: "status"; type: "QQuickStackView::Status"; isReadonly: true } + Property { name: "visible"; type: "bool" } + Signal { name: "activated" } + Signal { name: "activating" } + Signal { name: "deactivated" } + Signal { name: "deactivating" } + Signal { name: "removed" } + } + Component { name: "QQuickSwipe" prototype: "QObject" - Property { name: "position"; type: "double"; isReadonly: true } + Property { name: "position"; type: "double" } Property { name: "complete"; type: "bool"; isReadonly: true } + Property { name: "enabled"; type: "bool" } Property { name: "left"; type: "QQmlComponent"; isPointer: true } Property { name: "behind"; type: "QQmlComponent"; isPointer: true } Property { name: "right"; type: "QQmlComponent"; isPointer: true } Property { name: "leftItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "behindItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "rightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Signal { name: "completed"; revision: 1 } + Property { name: "transition"; type: "QQuickTransition"; isPointer: true } + Signal { name: "completed" } + Signal { name: "opened" } + Signal { name: "closed" } + Method { + name: "open" + revision: 2 + Parameter { name: "side"; type: "QQuickSwipeDelegate::Side" } + } Method { name: "close"; revision: 1 } } Component { @@ -1357,10 +1457,18 @@ Module { prototype: "QQuickItemDelegate" exports: [ "QtQuick.Templates/SwipeDelegate 2.0", - "QtQuick.Templates/SwipeDelegate 2.1" + "QtQuick.Templates/SwipeDelegate 2.1", + "QtQuick.Templates/SwipeDelegate 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] attachedType: "QQuickSwipeDelegateAttached" + Enum { + name: "Side" + values: { + "Left": 1, + "Right": -1 + } + } Property { name: "swipe"; type: "QQuickSwipe"; isReadonly: true; isPointer: true } } Component { @@ -1375,12 +1483,15 @@ Module { prototype: "QQuickContainer" exports: [ "QtQuick.Templates/SwipeView 2.0", - "QtQuick.Templates/SwipeView 2.1" + "QtQuick.Templates/SwipeView 2.1", + "QtQuick.Templates/SwipeView 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] attachedType: "QQuickSwipeViewAttached" Property { name: "interactive"; revision: 1; type: "bool" } + Property { name: "orientation"; revision: 2; type: "Qt::Orientation" } Signal { name: "interactiveChanged"; revision: 1 } + Signal { name: "orientationChanged"; revision: 2 } } Component { name: "QQuickSwipeViewAttached" @@ -1413,8 +1524,11 @@ Module { name: "QQuickTabBar" defaultProperty: "contentData" prototype: "QQuickContainer" - exports: ["QtQuick.Templates/TabBar 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQuick.Templates/TabBar 2.0", + "QtQuick.Templates/TabBar 2.2" + ] + exportMetaObjectRevisions: [0, 2] Enum { name: "Position" values: { @@ -1423,6 +1537,8 @@ Module { } } Property { name: "position"; type: "Position" } + Property { name: "contentWidth"; revision: 2; type: "double" } + Property { name: "contentHeight"; revision: 2; type: "double" } } Component { name: "QQuickTabButton" @@ -1577,9 +1693,10 @@ Module { prototype: "QQuickControl" exports: [ "QtQuick.Templates/Tumbler 2.0", - "QtQuick.Templates/Tumbler 2.1" + "QtQuick.Templates/Tumbler 2.1", + "QtQuick.Templates/Tumbler 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] attachedType: "QQuickTumblerAttached" Property { name: "model"; type: "QVariant" } Property { name: "count"; type: "int"; isReadonly: true } @@ -1588,7 +1705,9 @@ Module { Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "visibleItemCount"; type: "int" } Property { name: "wrap"; revision: 1; type: "bool" } + Property { name: "moving"; revision: 2; type: "bool"; isReadonly: true } Signal { name: "wrapChanged"; revision: 1 } + Signal { name: "movingChanged"; revision: 2 } } Component { name: "QQuickTumblerAttached" diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index 6b644437..d2151685 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/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 -dependencies dependencies.json QtQuick.Templates 2.1' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Templates 2.2' Module { - dependencies: ["QtQuick 2.8", "QtQuick.Window 2.2"] + dependencies: ["QtQuick 2.9", "QtQuick.Window 2.2"] Component { name: "QQuickAbstractButton" defaultProperty: "data" @@ -25,6 +25,7 @@ Module { Signal { name: "released" } Signal { name: "canceled" } Signal { name: "clicked" } + Signal { name: "toggled"; revision: 2 } Signal { name: "pressAndHold" } Signal { name: "doubleClicked" } Method { name: "toggle" } @@ -128,23 +129,38 @@ Module { prototype: "QQuickControl" exports: [ "QtQuick.Templates/ComboBox 2.0", - "QtQuick.Templates/ComboBox 2.1" + "QtQuick.Templates/ComboBox 2.1", + "QtQuick.Templates/ComboBox 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] Property { name: "count"; type: "int"; isReadonly: true } Property { name: "model"; type: "QVariant" } Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true } + Property { name: "editable"; revision: 2; type: "bool" } Property { name: "flat"; revision: 1; type: "bool" } + Property { name: "down"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "highlightedIndex"; type: "int"; isReadonly: true } Property { name: "currentIndex"; type: "int" } Property { name: "currentText"; type: "string"; isReadonly: true } Property { name: "displayText"; type: "string" } + Property { name: "editText"; revision: 2; type: "string" } Property { name: "textRole"; type: "string" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "indicator"; type: "QQuickItem"; isPointer: true } Property { name: "popup"; type: "QQuickPopup"; isPointer: true } + Property { name: "validator"; revision: 2; type: "QValidator"; isPointer: true } + Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" } + Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true } + Property { name: "acceptableInput"; revision: 2; type: "bool"; isReadonly: true } + Signal { name: "editableChanged"; revision: 2 } Signal { name: "flatChanged"; revision: 1 } + Signal { name: "downChanged"; revision: 2 } + Signal { name: "editTextChanged"; revision: 2 } + Signal { name: "validatorChanged"; revision: 2 } + Signal { name: "inputMethodHintsChanged"; revision: 2 } + Signal { name: "inputMethodComposingChanged"; revision: 2 } + Signal { name: "acceptableInputChanged"; revision: 2 } Signal { name: "activated" Parameter { name: "index"; type: "int" } @@ -153,8 +169,10 @@ Module { name: "highlighted" Parameter { name: "index"; type: "int" } } + Signal { name: "accepted"; revision: 2 } Method { name: "incrementCurrentIndex" } Method { name: "decrementCurrentIndex" } + Method { name: "selectAll"; revision: 2 } Method { name: "textAt" type: "string" @@ -244,11 +262,22 @@ Module { Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } } Component { + name: "QQuickDelayButton" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["QtQuick.Templates/DelayButton 2.2"] + exportMetaObjectRevisions: [0] + Property { name: "delay"; type: "int" } + Property { name: "progress"; type: "double" } + Property { name: "transition"; type: "QQuickTransition"; isPointer: true } + Signal { name: "activated" } + } + Component { name: "QQuickDial" defaultProperty: "data" prototype: "QQuickControl" - exports: ["QtQuick.Templates/Dial 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick.Templates/Dial 2.0", "QtQuick.Templates/Dial 2.2"] + exportMetaObjectRevisions: [0, 2] Enum { name: "SnapMode" values: { @@ -266,7 +295,10 @@ Module { Property { name: "snapMode"; type: "SnapMode" } Property { name: "wrap"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "live"; revision: 2; type: "bool" } Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Signal { name: "liveChanged"; revision: 2 } + Signal { name: "moved"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } } @@ -326,11 +358,16 @@ Module { name: "QQuickDrawer" defaultProperty: "contentData" prototype: "QQuickPopup" - exports: ["QtQuick.Templates/Drawer 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQuick.Templates/Drawer 2.0", + "QtQuick.Templates/Drawer 2.2" + ] + exportMetaObjectRevisions: [0, 2] Property { name: "edge"; type: "Qt::Edge" } Property { name: "position"; type: "double" } Property { name: "dragMargin"; type: "double" } + Property { name: "interactive"; revision: 2; type: "bool" } + Signal { name: "interactiveChanged"; revision: 2 } } Component { name: "QQuickFrame" @@ -586,9 +623,10 @@ Module { prototype: "QQuickControl" exports: [ "QtQuick.Templates/RangeSlider 2.0", - "QtQuick.Templates/RangeSlider 2.1" + "QtQuick.Templates/RangeSlider 2.1", + "QtQuick.Templates/RangeSlider 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "SnapMode" values: { @@ -604,6 +642,8 @@ Module { Property { name: "stepSize"; type: "double" } Property { name: "snapMode"; type: "SnapMode" } Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "live"; revision: 2; type: "bool" } + Signal { name: "liveChanged"; revision: 2 } Method { name: "setValues" Parameter { name: "firstValue"; type: "double" } @@ -635,15 +675,40 @@ Module { name: "QQuickScrollBar" defaultProperty: "data" prototype: "QQuickControl" - exports: ["QtQuick.Templates/ScrollBar 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQuick.Templates/ScrollBar 2.0", + "QtQuick.Templates/ScrollBar 2.2" + ] + exportMetaObjectRevisions: [0, 2] attachedType: "QQuickScrollBarAttached" + Enum { + name: "SnapMode" + values: { + "NoSnap": 0, + "SnapAlways": 1, + "SnapOnRelease": 2 + } + } + Enum { + name: "Policy" + values: { + "AsNeeded": 0, + "AlwaysOff": 1, + "AlwaysOn": 2 + } + } Property { name: "size"; type: "double" } Property { name: "position"; type: "double" } Property { name: "stepSize"; type: "double" } Property { name: "active"; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "snapMode"; revision: 2; type: "SnapMode" } + Property { name: "interactive"; revision: 2; type: "bool" } + Property { name: "policy"; revision: 2; type: "Policy" } + Signal { name: "snapModeChanged"; revision: 2 } + Signal { name: "interactiveChanged"; revision: 2 } + Signal { name: "policyChanged"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -693,9 +758,10 @@ Module { prototype: "QQuickControl" exports: [ "QtQuick.Templates/Slider 2.0", - "QtQuick.Templates/Slider 2.1" + "QtQuick.Templates/Slider 2.1", + "QtQuick.Templates/Slider 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "SnapMode" values: { @@ -711,9 +777,12 @@ Module { Property { name: "visualPosition"; type: "double"; isReadonly: true } Property { name: "stepSize"; type: "double" } Property { name: "snapMode"; type: "SnapMode" } + Property { name: "live"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "orientation"; type: "Qt::Orientation" } Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Signal { name: "liveChanged"; revision: 2 } + Signal { name: "moved"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -729,9 +798,10 @@ Module { prototype: "QQuickControl" exports: [ "QtQuick.Templates/SpinBox 2.0", - "QtQuick.Templates/SpinBox 2.1" + "QtQuick.Templates/SpinBox 2.1", + "QtQuick.Templates/SpinBox 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] Property { name: "from"; type: "int" } Property { name: "to"; type: "int" } Property { name: "value"; type: "int" } @@ -742,6 +812,11 @@ Module { Property { name: "valueFromText"; type: "QJSValue" } Property { name: "up"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true } Property { name: "down"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true } + Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" } + Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true } + Signal { name: "valueModified"; revision: 2 } + Signal { name: "inputMethodHintsChanged"; revision: 2 } + Signal { name: "inputMethodComposingChanged"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } } @@ -754,18 +829,6 @@ Module { Signal { name: "hoveredChanged"; revision: 1 } } Component { - name: "QQuickStackAttached" - prototype: "QObject" - Property { name: "index"; type: "int"; isReadonly: true } - Property { name: "view"; type: "QQuickStackView"; isReadonly: true; isPointer: true } - Property { name: "status"; type: "QQuickStackView::Status"; isReadonly: true } - Signal { name: "activated" } - Signal { name: "activating" } - Signal { name: "deactivated" } - Signal { name: "deactivating" } - Signal { name: "removed" } - } - Component { name: "QQuickStackView" defaultProperty: "data" prototype: "QQuickControl" @@ -774,7 +837,7 @@ Module { "QtQuick.Templates/StackView 2.1" ] exportMetaObjectRevisions: [0, 1] - attachedType: "QQuickStackAttached" + attachedType: "QQuickStackViewAttached" Enum { name: "Status" values: { @@ -848,17 +911,39 @@ Module { } } Component { + name: "QQuickStackViewAttached" + prototype: "QObject" + Property { name: "index"; type: "int"; isReadonly: true } + Property { name: "view"; type: "QQuickStackView"; isReadonly: true; isPointer: true } + Property { name: "status"; type: "QQuickStackView::Status"; isReadonly: true } + Property { name: "visible"; type: "bool" } + Signal { name: "activated" } + Signal { name: "activating" } + Signal { name: "deactivated" } + Signal { name: "deactivating" } + Signal { name: "removed" } + } + Component { name: "QQuickSwipe" prototype: "QObject" - Property { name: "position"; type: "double"; isReadonly: true } + Property { name: "position"; type: "double" } Property { name: "complete"; type: "bool"; isReadonly: true } + Property { name: "enabled"; type: "bool" } Property { name: "left"; type: "QQmlComponent"; isPointer: true } Property { name: "behind"; type: "QQmlComponent"; isPointer: true } Property { name: "right"; type: "QQmlComponent"; isPointer: true } Property { name: "leftItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "behindItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "rightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Signal { name: "completed"; revision: 1 } + Property { name: "transition"; type: "QQuickTransition"; isPointer: true } + Signal { name: "completed" } + Signal { name: "opened" } + Signal { name: "closed" } + Method { + name: "open" + revision: 2 + Parameter { name: "side"; type: "QQuickSwipeDelegate::Side" } + } Method { name: "close"; revision: 1 } } Component { @@ -867,10 +952,18 @@ Module { prototype: "QQuickItemDelegate" exports: [ "QtQuick.Templates/SwipeDelegate 2.0", - "QtQuick.Templates/SwipeDelegate 2.1" + "QtQuick.Templates/SwipeDelegate 2.1", + "QtQuick.Templates/SwipeDelegate 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] attachedType: "QQuickSwipeDelegateAttached" + Enum { + name: "Side" + values: { + "Left": 1, + "Right": -1 + } + } Property { name: "swipe"; type: "QQuickSwipe"; isReadonly: true; isPointer: true } } Component { @@ -885,12 +978,15 @@ Module { prototype: "QQuickContainer" exports: [ "QtQuick.Templates/SwipeView 2.0", - "QtQuick.Templates/SwipeView 2.1" + "QtQuick.Templates/SwipeView 2.1", + "QtQuick.Templates/SwipeView 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] attachedType: "QQuickSwipeViewAttached" Property { name: "interactive"; revision: 1; type: "bool" } + Property { name: "orientation"; revision: 2; type: "Qt::Orientation" } Signal { name: "interactiveChanged"; revision: 1 } + Signal { name: "orientationChanged"; revision: 2 } } Component { name: "QQuickSwipeViewAttached" @@ -923,8 +1019,11 @@ Module { name: "QQuickTabBar" defaultProperty: "contentData" prototype: "QQuickContainer" - exports: ["QtQuick.Templates/TabBar 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQuick.Templates/TabBar 2.0", + "QtQuick.Templates/TabBar 2.2" + ] + exportMetaObjectRevisions: [0, 2] Enum { name: "Position" values: { @@ -933,6 +1032,8 @@ Module { } } Property { name: "position"; type: "Position" } + Property { name: "contentWidth"; revision: 2; type: "double" } + Property { name: "contentHeight"; revision: 2; type: "double" } } Component { name: "QQuickTabButton" @@ -1087,9 +1188,10 @@ Module { prototype: "QQuickControl" exports: [ "QtQuick.Templates/Tumbler 2.0", - "QtQuick.Templates/Tumbler 2.1" + "QtQuick.Templates/Tumbler 2.1", + "QtQuick.Templates/Tumbler 2.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 2] attachedType: "QQuickTumblerAttached" Property { name: "model"; type: "QVariant" } Property { name: "count"; type: "int"; isReadonly: true } @@ -1098,7 +1200,9 @@ Module { Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "visibleItemCount"; type: "int" } Property { name: "wrap"; revision: 1; type: "bool" } + Property { name: "moving"; revision: 2; type: "bool"; isReadonly: true } Signal { name: "wrapChanged"; revision: 1 } + Signal { name: "movingChanged"; revision: 2 } } Component { name: "QQuickTumblerAttached" |