diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-06 15:47:56 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-06 15:22:19 +0000 |
commit | 48b2107bf4eb76e3cc8d4043a3e8ec8a1646f53c (patch) | |
tree | 5402808f62c1e3b20cc0ee4ec98f9b8d35fb2336 /src/imports/templates | |
parent | ea4dc11ce772d34ee71e4dca0b09f329e2953c68 (diff) |
Update plugins.qmltypes
Change-Id: Ia2d3c5ce96ea30838ef69ed7df03db49b3f3a339
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/templates')
-rw-r--r-- | src/imports/templates/plugins.qmltypes | 136 |
1 files changed, 109 insertions, 27 deletions
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index 0283f50d..46c601e2 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/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.Templates 2.4' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Templates 2.5' Module { dependencies: ["QtQuick 2.9", "QtQuick.Window 2.2"] @@ -379,15 +379,17 @@ Module { Parameter { name: "index"; type: "int" } } } + Component { name: "QQuickContentItem"; defaultProperty: "data"; prototype: "QQuickItem" } Component { name: "QQuickControl" defaultProperty: "data" prototype: "QQuickItem" exports: [ "QtQuick.Templates/Control 2.0", - "QtQuick.Templates/Control 2.3" + "QtQuick.Templates/Control 2.3", + "QtQuick.Templates/Control 2.5" ] - exportMetaObjectRevisions: [0, 3] + exportMetaObjectRevisions: [0, 3, 5] Property { name: "font"; type: "QFont" } Property { name: "availableWidth"; type: "double"; isReadonly: true } Property { name: "availableHeight"; type: "double"; isReadonly: true } @@ -407,8 +409,13 @@ Module { Property { name: "wheelEnabled"; type: "bool" } Property { name: "background"; type: "QQuickItem"; isPointer: true } Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "baselineOffset"; type: "double" } Property { name: "palette"; revision: 3; type: "QPalette" } + Property { name: "horizontalPadding"; revision: 5; type: "double" } + Property { name: "verticalPadding"; revision: 5; type: "double" } Signal { name: "paletteChanged"; revision: 3 } + Signal { name: "horizontalPaddingChanged"; revision: 5 } + Signal { name: "verticalPaddingChanged"; revision: 5 } } Component { name: "QQuickDelayButton" @@ -498,9 +505,10 @@ Module { prototype: "QQuickContainer" exports: [ "QtQuick.Templates/DialogButtonBox 2.1", - "QtQuick.Templates/DialogButtonBox 2.3" + "QtQuick.Templates/DialogButtonBox 2.3", + "QtQuick.Templates/DialogButtonBox 2.5" ] - exportMetaObjectRevisions: [0, 3] + exportMetaObjectRevisions: [0, 3, 5] attachedType: "QQuickDialogButtonBoxAttached" Enum { name: "Position" @@ -509,10 +517,23 @@ Module { "Footer": 1 } } + Enum { + name: "ButtonLayout" + values: { + "UnknownLayout": -1, + "WinLayout": 0, + "MacLayout": 1, + "KdeLayout": 2, + "GnomeLayout": 3, + "MacModelessLayout": 4, + "AndroidLayout": 5 + } + } Property { name: "position"; type: "Position" } Property { name: "alignment"; type: "Qt::Alignment" } Property { name: "standardButtons"; type: "QPlatformDialogHelper::StandardButtons" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "buttonLayout"; revision: 5; type: "ButtonLayout" } Signal { name: "accepted" } Signal { name: "rejected" } Signal { name: "helpRequested" } @@ -523,6 +544,7 @@ Module { Signal { name: "applied"; revision: 3 } Signal { name: "reset"; revision: 3 } Signal { name: "discarded"; revision: 3 } + Signal { name: "buttonLayoutChanged"; revision: 5 } Method { name: "standardButton" type: "QQuickAbstractButton*" @@ -811,18 +833,14 @@ Module { Component { name: "QQuickPage" defaultProperty: "contentData" - prototype: "QQuickControl" + prototype: "QQuickPane" exports: ["QtQuick.Templates/Page 2.0", "QtQuick.Templates/Page 2.1"] exportMetaObjectRevisions: [0, 1] Property { name: "title"; type: "string" } Property { name: "header"; type: "QQuickItem"; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isPointer: true } - Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } Property { name: "contentWidth"; revision: 1; type: "double" } Property { name: "contentHeight"; revision: 1; type: "double" } - Signal { name: "contentWidthChanged"; revision: 1 } - Signal { name: "contentHeightChanged"; revision: 1 } } Component { name: "QQuickPageIndicator" @@ -853,9 +871,10 @@ Module { exports: [ "QtQuick.Templates/Popup 2.0", "QtQuick.Templates/Popup 2.1", - "QtQuick.Templates/Popup 2.3" + "QtQuick.Templates/Popup 2.3", + "QtQuick.Templates/Popup 2.5" ] - exportMetaObjectRevisions: [0, 1, 3] + exportMetaObjectRevisions: [0, 1, 3, 5] Enum { name: "ClosePolicy" values: { @@ -926,6 +945,15 @@ Module { Property { name: "mirrored"; revision: 3; type: "bool"; isReadonly: true } Property { name: "enabled"; revision: 3; type: "bool" } Property { name: "palette"; revision: 3; type: "QPalette" } + Property { name: "horizontalPadding"; type: "double" } + Property { name: "verticalPadding"; type: "double" } + Property { + name: "anchors" + revision: 5 + type: "QQuickPopupAnchors" + isReadonly: true + isPointer: true + } Signal { name: "opened" } Signal { name: "closed" } Signal { name: "aboutToShow" } @@ -939,6 +967,8 @@ Module { Signal { name: "mirroredChanged"; revision: 3 } Signal { name: "enabledChanged"; revision: 3 } Signal { name: "paletteChanged"; revision: 3 } + Signal { name: "horizontalPaddingChanged"; revision: 5 } + Signal { name: "verticalPaddingChanged"; revision: 5 } Method { name: "open" } Method { name: "close" } Method { @@ -948,6 +978,11 @@ Module { Method { name: "forceActiveFocus" } } Component { + name: "QQuickPopupAnchors" + prototype: "QObject" + Property { name: "centerIn"; type: "QQuickItem"; isPointer: true } + } + Component { name: "QQuickProgressBar" defaultProperty: "data" prototype: "QQuickControl" @@ -982,9 +1017,10 @@ Module { "QtQuick.Templates/RangeSlider 2.0", "QtQuick.Templates/RangeSlider 2.1", "QtQuick.Templates/RangeSlider 2.2", - "QtQuick.Templates/RangeSlider 2.3" + "QtQuick.Templates/RangeSlider 2.3", + "QtQuick.Templates/RangeSlider 2.5" ] - exportMetaObjectRevisions: [0, 1, 2, 3] + exportMetaObjectRevisions: [0, 1, 2, 3, 5] Enum { name: "SnapMode" values: { @@ -1003,12 +1039,20 @@ Module { Property { name: "live"; revision: 2; type: "bool" } Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } + Property { name: "touchDragThreshold"; revision: 5; type: "double" } Signal { name: "liveChanged"; revision: 2 } + Signal { name: "touchDragThresholdChanged"; revision: 5 } Method { name: "setValues" Parameter { name: "firstValue"; type: "double" } Parameter { name: "secondValue"; type: "double" } } + Method { + name: "valueAt" + revision: 5 + type: "double" + Parameter { name: "position"; type: "double" } + } } Component { name: "QQuickRangeSliderNode" @@ -1020,6 +1064,7 @@ Module { Property { name: "pressed"; type: "bool" } Property { name: "hovered"; revision: 1; type: "bool" } Signal { name: "hoveredChanged"; revision: 1 } + Signal { name: "moved" } Method { name: "increase" } Method { name: "decrease" } } @@ -1137,13 +1182,9 @@ Module { Component { name: "QQuickScrollView" defaultProperty: "contentData" - prototype: "QQuickControl" + prototype: "QQuickPane" exports: ["QtQuick.Templates/ScrollView 2.2"] exportMetaObjectRevisions: [0] - Property { name: "contentWidth"; type: "double" } - Property { name: "contentHeight"; type: "double" } - Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } } Component { name: "QQuickSlider" @@ -1153,9 +1194,10 @@ Module { "QtQuick.Templates/Slider 2.0", "QtQuick.Templates/Slider 2.1", "QtQuick.Templates/Slider 2.2", - "QtQuick.Templates/Slider 2.3" + "QtQuick.Templates/Slider 2.3", + "QtQuick.Templates/Slider 2.5" ] - exportMetaObjectRevisions: [0, 1, 2, 3] + exportMetaObjectRevisions: [0, 1, 2, 3, 5] Enum { name: "SnapMode" values: { @@ -1177,8 +1219,10 @@ Module { Property { name: "live"; revision: 2; type: "bool" } Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } + Property { name: "touchDragThreshold"; revision: 5; type: "double" } Signal { name: "moved"; revision: 2 } Signal { name: "liveChanged"; revision: 2 } + Signal { name: "touchDragThresholdChanged"; revision: 5 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -1469,9 +1513,10 @@ Module { exports: [ "QtQuick.Templates/TextArea 2.0", "QtQuick.Templates/TextArea 2.1", - "QtQuick.Templates/TextArea 2.3" + "QtQuick.Templates/TextArea 2.3", + "QtQuick.Templates/TextArea 2.5" ] - exportMetaObjectRevisions: [0, 1, 3] + exportMetaObjectRevisions: [0, 1, 3, 5] attachedType: "QQuickTextAreaAttached" Property { name: "font"; type: "QFont" } Property { name: "implicitWidth"; type: "double" } @@ -1482,6 +1527,7 @@ Module { Property { name: "hovered"; revision: 1; type: "bool"; isReadonly: true } Property { name: "hoverEnabled"; revision: 1; type: "bool" } Property { name: "palette"; revision: 3; type: "QPalette" } + Property { name: "placeholderTextColor"; revision: 5; type: "QColor" } Signal { name: "implicitWidthChanged3" } Signal { name: "implicitHeightChanged3" } Signal { @@ -1501,6 +1547,7 @@ Module { Signal { name: "hoveredChanged"; revision: 1 } Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "paletteChanged"; revision: 3 } + Signal { name: "placeholderTextColorChanged"; revision: 5 } } Component { name: "QQuickTextAreaAttached" @@ -1514,9 +1561,10 @@ Module { exports: [ "QtQuick.Templates/TextField 2.0", "QtQuick.Templates/TextField 2.1", - "QtQuick.Templates/TextField 2.3" + "QtQuick.Templates/TextField 2.3", + "QtQuick.Templates/TextField 2.5" ] - exportMetaObjectRevisions: [0, 1, 3] + exportMetaObjectRevisions: [0, 1, 3, 5] Property { name: "font"; type: "QFont" } Property { name: "implicitWidth"; type: "double" } Property { name: "implicitHeight"; type: "double" } @@ -1526,6 +1574,7 @@ Module { Property { name: "hovered"; revision: 1; type: "bool"; isReadonly: true } Property { name: "hoverEnabled"; revision: 1; type: "bool" } Property { name: "palette"; revision: 3; type: "QPalette" } + Property { name: "placeholderTextColor"; revision: 5; type: "QColor" } Signal { name: "implicitWidthChanged3" } Signal { name: "implicitHeightChanged3" } Signal { @@ -1545,6 +1594,7 @@ Module { Signal { name: "hoveredChanged"; revision: 1 } Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "paletteChanged"; revision: 3 } + Signal { name: "placeholderTextColorChanged"; revision: 5 } } Component { name: "QQuickToolBar" @@ -1582,12 +1632,27 @@ Module { name: "QQuickToolTip" defaultProperty: "contentData" prototype: "QQuickPopup" - exports: ["QtQuick.Templates/ToolTip 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQuick.Templates/ToolTip 2.0", + "QtQuick.Templates/ToolTip 2.5" + ] + exportMetaObjectRevisions: [0, 5] attachedType: "QQuickToolTipAttached" Property { name: "delay"; type: "int" } Property { name: "timeout"; type: "int" } Property { name: "text"; type: "string" } + Method { + name: "show" + revision: 5 + Parameter { name: "text"; type: "string" } + Parameter { name: "ms"; type: "int" } + } + Method { + name: "show" + revision: 5 + Parameter { name: "text"; type: "string" } + } + Method { name: "hide"; revision: 5 } } Component { name: "QQuickToolTipAttached" @@ -1619,6 +1684,17 @@ Module { ] exportMetaObjectRevisions: [0, 1, 2] attachedType: "QQuickTumblerAttached" + Enum { + name: "PositionMode" + values: { + "Beginning": 0, + "Center": 1, + "End": 2, + "Visible": 3, + "Contain": 4, + "SnapPosition": 5 + } + } Property { name: "model"; type: "QVariant" } Property { name: "count"; type: "int"; isReadonly: true } Property { name: "currentIndex"; type: "int" } @@ -1629,6 +1705,12 @@ Module { Property { name: "moving"; revision: 2; type: "bool"; isReadonly: true } Signal { name: "wrapChanged"; revision: 1 } Signal { name: "movingChanged"; revision: 2 } + Method { + name: "positionViewAtIndex" + revision: 5 + Parameter { name: "index"; type: "int" } + Parameter { name: "mode"; type: "PositionMode" } + } } Component { name: "QQuickTumblerAttached" |