aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/templates
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/templates')
-rw-r--r--src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc4
-rw-r--r--src/imports/templates/plugins.qmltypes245
-rw-r--r--src/imports/templates/qtquicktemplates2plugin.cpp30
-rw-r--r--src/imports/templates/templates.pro2
4 files changed, 226 insertions, 55 deletions
diff --git a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc
index 695156b4..01e70bb2 100644
--- a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc
+++ b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \qmlmodule QtQuick.Templates 2.4
+ \qmlmodule QtQuick.Templates 2.5
\title Qt Quick Templates 2 QML Types
\ingroup qmlmodules
\brief Provides QML types for templates (Qt Quick Templates).
@@ -38,7 +38,7 @@
\c .qml file:
\badcode
- import QtQuick.Templates 2.4 as T
+ import QtQuick.Templates 2.5 as T
\endcode
For the sake of clarity, there is a one-to-one mapping between the types
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes
index 0283f50d..96c1b5c0 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"]
@@ -16,9 +16,10 @@ Module {
"QtQuick.Templates/AbstractButton 2.0",
"QtQuick.Templates/AbstractButton 2.2",
"QtQuick.Templates/AbstractButton 2.3",
- "QtQuick.Templates/AbstractButton 2.4"
+ "QtQuick.Templates/AbstractButton 2.4",
+ "QtQuick.Templates/AbstractButton 2.5"
]
- exportMetaObjectRevisions: [0, 2, 3, 4]
+ exportMetaObjectRevisions: [0, 2, 3, 4, 5]
Enum {
name: "Display"
values: {
@@ -43,6 +44,8 @@ Module {
Property { name: "autoRepeatInterval"; revision: 4; type: "int" }
Property { name: "pressX"; revision: 4; type: "double"; isReadonly: true }
Property { name: "pressY"; revision: 4; type: "double"; isReadonly: true }
+ Property { name: "implicitIndicatorWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitIndicatorHeight"; revision: 5; type: "double"; isReadonly: true }
Signal { name: "pressed" }
Signal { name: "released" }
Signal { name: "canceled" }
@@ -57,6 +60,8 @@ Module {
Signal { name: "autoRepeatIntervalChanged"; revision: 4 }
Signal { name: "pressXChanged"; revision: 4 }
Signal { name: "pressYChanged"; revision: 4 }
+ Signal { name: "implicitIndicatorWidthChanged"; revision: 5 }
+ Signal { name: "implicitIndicatorHeightChanged"; revision: 5 }
Method { name: "toggle" }
}
Component {
@@ -267,9 +272,10 @@ Module {
exports: [
"QtQuick.Templates/ComboBox 2.0",
"QtQuick.Templates/ComboBox 2.1",
- "QtQuick.Templates/ComboBox 2.2"
+ "QtQuick.Templates/ComboBox 2.2",
+ "QtQuick.Templates/ComboBox 2.5"
]
- exportMetaObjectRevisions: [0, 1, 2]
+ exportMetaObjectRevisions: [0, 1, 2, 5]
Property { name: "count"; type: "int"; isReadonly: true }
Property { name: "model"; type: "QVariant" }
Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true }
@@ -290,6 +296,8 @@ Module {
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 }
+ Property { name: "implicitIndicatorWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitIndicatorHeight"; revision: 5; type: "double"; isReadonly: true }
Signal {
name: "activated"
Parameter { name: "index"; type: "int" }
@@ -307,6 +315,8 @@ Module {
Signal { name: "inputMethodHintsChanged"; revision: 2 }
Signal { name: "inputMethodComposingChanged"; revision: 2 }
Signal { name: "acceptableInputChanged"; revision: 2 }
+ Signal { name: "implicitIndicatorWidthChanged"; revision: 5 }
+ Signal { name: "implicitIndicatorHeightChanged"; revision: 5 }
Method { name: "incrementCurrentIndex" }
Method { name: "decrementCurrentIndex" }
Method { name: "selectAll"; revision: 2 }
@@ -334,15 +344,20 @@ Module {
exports: [
"QtQuick.Templates/Container 2.0",
"QtQuick.Templates/Container 2.1",
- "QtQuick.Templates/Container 2.3"
+ "QtQuick.Templates/Container 2.3",
+ "QtQuick.Templates/Container 2.5"
]
- exportMetaObjectRevisions: [0, 1, 3]
+ exportMetaObjectRevisions: [0, 1, 3, 5]
Property { name: "count"; type: "int"; isReadonly: true }
Property { name: "contentModel"; type: "QVariant"; isReadonly: true }
Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
Property { name: "currentIndex"; type: "int" }
Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "contentWidth"; revision: 5; type: "double" }
+ Property { name: "contentHeight"; revision: 5; type: "double" }
+ Signal { name: "contentWidthChanged"; revision: 5 }
+ Signal { name: "contentHeightChanged"; revision: 5 }
Method {
name: "setCurrentIndex"
Parameter { name: "index"; type: "int" }
@@ -379,15 +394,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 +424,29 @@ 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" }
+ Property { name: "implicitContentWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitContentHeight"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "topInset"; revision: 5; type: "double" }
+ Property { name: "leftInset"; revision: 5; type: "double" }
+ Property { name: "rightInset"; revision: 5; type: "double" }
+ Property { name: "bottomInset"; revision: 5; type: "double" }
Signal { name: "paletteChanged"; revision: 3 }
+ Signal { name: "horizontalPaddingChanged"; revision: 5 }
+ Signal { name: "verticalPaddingChanged"; revision: 5 }
+ Signal { name: "implicitContentWidthChanged"; revision: 5 }
+ Signal { name: "implicitContentHeightChanged"; revision: 5 }
+ Signal { name: "implicitBackgroundWidthChanged"; revision: 5 }
+ Signal { name: "implicitBackgroundHeightChanged"; revision: 5 }
+ Signal { name: "topInsetChanged"; revision: 5 }
+ Signal { name: "leftInsetChanged"; revision: 5 }
+ Signal { name: "rightInsetChanged"; revision: 5 }
+ Signal { name: "bottomInsetChanged"; revision: 5 }
}
Component {
name: "QQuickDelayButton"
@@ -457,9 +495,10 @@ Module {
prototype: "QQuickPopup"
exports: [
"QtQuick.Templates/Dialog 2.1",
- "QtQuick.Templates/Dialog 2.3"
+ "QtQuick.Templates/Dialog 2.3",
+ "QtQuick.Templates/Dialog 2.5"
]
- exportMetaObjectRevisions: [0, 3]
+ exportMetaObjectRevisions: [0, 3, 5]
Enum {
name: "StandardCode"
values: {
@@ -472,6 +511,10 @@ Module {
Property { name: "footer"; type: "QQuickItem"; isPointer: true }
Property { name: "standardButtons"; type: "QPlatformDialogHelper::StandardButtons" }
Property { name: "result"; revision: 3; type: "int" }
+ Property { name: "implicitHeaderWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitHeaderHeight"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitFooterWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitFooterHeight"; revision: 5; type: "double"; isReadonly: true }
Signal { name: "accepted" }
Signal { name: "rejected" }
Signal { name: "applied"; revision: 3 }
@@ -498,9 +541,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 +553,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 +580,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*"
@@ -561,10 +619,17 @@ Module {
name: "QQuickGroupBox"
defaultProperty: "contentData"
prototype: "QQuickFrame"
- exports: ["QtQuick.Templates/GroupBox 2.0"]
- exportMetaObjectRevisions: [0]
+ exports: [
+ "QtQuick.Templates/GroupBox 2.0",
+ "QtQuick.Templates/GroupBox 2.5"
+ ]
+ exportMetaObjectRevisions: [0, 5]
Property { name: "title"; type: "string" }
Property { name: "label"; type: "QQuickItem"; isPointer: true }
+ Property { name: "implicitLabelWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitLabelHeight"; revision: 5; type: "double"; isReadonly: true }
+ Signal { name: "implicitLabelWidthChanged"; revision: 5 }
+ Signal { name: "implicitLabelHeightChanged"; revision: 5 }
}
Component {
name: "QQuickIcon"
@@ -811,18 +876,22 @@ Module {
Component {
name: "QQuickPage"
defaultProperty: "contentData"
- prototype: "QQuickControl"
- exports: ["QtQuick.Templates/Page 2.0", "QtQuick.Templates/Page 2.1"]
- exportMetaObjectRevisions: [0, 1]
+ prototype: "QQuickPane"
+ exports: [
+ "QtQuick.Templates/Page 2.0",
+ "QtQuick.Templates/Page 2.1",
+ "QtQuick.Templates/Page 2.5"
+ ]
+ exportMetaObjectRevisions: [0, 1, 5]
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 }
+ Property { name: "implicitHeaderWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitHeaderHeight"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitFooterWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitFooterHeight"; revision: 5; type: "double"; isReadonly: true }
}
Component {
name: "QQuickPageIndicator"
@@ -853,9 +922,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 +996,23 @@ 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
+ }
+ Property { name: "implicitContentWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitContentHeight"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "topInset"; revision: 5; type: "double" }
+ Property { name: "leftInset"; revision: 5; type: "double" }
+ Property { name: "rightInset"; revision: 5; type: "double" }
+ Property { name: "bottomInset"; revision: 5; type: "double" }
Signal { name: "opened" }
Signal { name: "closed" }
Signal { name: "aboutToShow" }
@@ -939,6 +1026,16 @@ 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 }
+ Signal { name: "implicitContentWidthChanged"; revision: 5 }
+ Signal { name: "implicitContentHeightChanged"; revision: 5 }
+ Signal { name: "implicitBackgroundWidthChanged"; revision: 5 }
+ Signal { name: "implicitBackgroundHeightChanged"; revision: 5 }
+ Signal { name: "topInsetChanged"; revision: 5 }
+ Signal { name: "leftInsetChanged"; revision: 5 }
+ Signal { name: "rightInsetChanged"; revision: 5 }
+ Signal { name: "bottomInsetChanged"; revision: 5 }
Method { name: "open" }
Method { name: "close" }
Method {
@@ -948,6 +1045,12 @@ Module {
Method { name: "forceActiveFocus" }
}
Component {
+ name: "QQuickPopupAnchors"
+ prototype: "QObject"
+ Property { name: "centerIn"; type: "QQuickItem"; isPointer: true }
+ }
+ Component { name: "QQuickPopupItem"; defaultProperty: "contentData"; prototype: "QQuickPage" }
+ Component {
name: "QQuickProgressBar"
defaultProperty: "data"
prototype: "QQuickControl"
@@ -982,9 +1085,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 +1107,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"
@@ -1019,7 +1131,10 @@ Module {
Property { name: "handle"; type: "QQuickItem"; isPointer: true }
Property { name: "pressed"; type: "bool" }
Property { name: "hovered"; revision: 1; type: "bool" }
+ Property { name: "implicitHandleWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitHandleHeight"; revision: 5; type: "double"; isReadonly: true }
Signal { name: "hoveredChanged"; revision: 1 }
+ Signal { name: "moved" }
Method { name: "increase" }
Method { name: "decrease" }
}
@@ -1137,13 +1252,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 +1264,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 +1289,14 @@ 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" }
+ Property { name: "implicitHandleWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitHandleHeight"; revision: 5; type: "double"; isReadonly: true }
Signal { name: "moved"; revision: 2 }
Signal { name: "liveChanged"; revision: 2 }
+ Signal { name: "touchDragThresholdChanged"; revision: 5 }
+ Signal { name: "implicitHandleWidthChanged"; revision: 5 }
+ Signal { name: "implicitHandleHeightChanged"; revision: 5 }
Method { name: "increase" }
Method { name: "decrease" }
Method {
@@ -1197,9 +1315,10 @@ Module {
"QtQuick.Templates/SpinBox 2.1",
"QtQuick.Templates/SpinBox 2.2",
"QtQuick.Templates/SpinBox 2.3",
- "QtQuick.Templates/SpinBox 2.4"
+ "QtQuick.Templates/SpinBox 2.4",
+ "QtQuick.Templates/SpinBox 2.5"
]
- exportMetaObjectRevisions: [0, 1, 2, 3, 4]
+ exportMetaObjectRevisions: [0, 1, 2, 3, 4, 5]
Property { name: "from"; type: "int" }
Property { name: "to"; type: "int" }
Property { name: "value"; type: "int" }
@@ -1228,7 +1347,11 @@ Module {
Property { name: "pressed"; type: "bool" }
Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
Property { name: "hovered"; revision: 1; type: "bool" }
+ Property { name: "implicitIndicatorWidth"; revision: 5; type: "double"; isReadonly: true }
+ Property { name: "implicitIndicatorHeight"; revision: 5; type: "double"; isReadonly: true }
Signal { name: "hoveredChanged"; revision: 1 }
+ Signal { name: "implicitIndicatorWidthChanged"; revision: 5 }
+ Signal { name: "implicitIndicatorHeightChanged"; revision: 5 }
}
Component {
name: "QQuickStackView"
@@ -1445,8 +1568,6 @@ Module {
Property { name: "position"; type: "Position" }
Property { name: "contentWidth"; revision: 2; type: "double" }
Property { name: "contentHeight"; revision: 2; type: "double" }
- Signal { name: "contentWidthChanged"; revision: 2 }
- Signal { name: "contentHeightChanged"; revision: 2 }
}
Component {
name: "QQuickTabBarAttached"
@@ -1469,9 +1590,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 +1604,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 +1624,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 +1638,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 +1651,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 +1671,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 +1709,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 +1761,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 +1782,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"
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index ec61b07c..ef7a646b 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -70,6 +70,7 @@
#include <QtQuickTemplates2/private/qquickpaletteprovider_p.h>
#include <QtQuickTemplates2/private/qquickpane_p.h>
#include <QtQuickTemplates2/private/qquickpopup_p.h>
+#include <QtQuickTemplates2/private/qquickpopupanchors_p.h>
#include <QtQuickTemplates2/private/qquickprogressbar_p.h>
#include <QtQuickTemplates2/private/qquickradiobutton_p.h>
#include <QtQuickTemplates2/private/qquickradiodelegate_p.h>
@@ -99,13 +100,6 @@
#include <QtQuickTemplates2/private/qquicktumbler_p.h>
#endif
-static inline void initResources()
-{
-#ifdef QT_STATIC
- Q_INIT_RESOURCE(qmake_QtQuick_Templates_2);
-#endif
-}
-
#if QT_CONFIG(shortcut)
// qtdeclarative/src/quick/util/qquickshortcut.cpp
typedef bool (*ShortcutContextMatcher)(QObject *, Qt::ShortcutContext);
@@ -146,8 +140,6 @@ private:
QtQuickTemplates2Plugin::QtQuickTemplates2Plugin(QObject *parent)
: QQmlExtensionPlugin(parent), registered(false)
{
- initResources();
-
#if QT_CONFIG(shortcut)
originalContextMatcher = qt_quick_shortcut_context_matcher();
qt_quick_set_shortcut_context_matcher(QQuickShortcutContext::matcher);
@@ -329,6 +321,26 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
qmlRegisterType<QQuickScrollBar, 4>(uri, 2, 4, "ScrollBar");
qmlRegisterType<QQuickScrollIndicator, 4>(uri, 2, 4, "ScrollIndicator");
qmlRegisterType<QQuickSpinBox, 4>(uri, 2, 4, "SpinBox");
+
+ // QtQuick.Templates 2.5 (new types and revisions in Qt 5.12)
+ qmlRegisterType<QQuickAbstractButton, 5>(uri, 2, 5, "AbstractButton");
+ qmlRegisterType<QQuickDialogButtonBox, 5>(uri, 2, 5, "DialogButtonBox");
+ qmlRegisterType<QQuickComboBox, 5>(uri, 2, 5, "ComboBox");
+ qmlRegisterType<QQuickControl, 5>(uri, 2, 5, "Control");
+ qmlRegisterType<QQuickContainer, 5>(uri, 2, 5, "Container");
+ qmlRegisterType<QQuickDial, 5>(uri, 2, 5, "Dial");
+ qmlRegisterType<QQuickDialog, 5>(uri, 2, 5, "Dialog");
+ qmlRegisterType<QQuickGroupBox, 5>(uri, 2, 5, "GroupBox");
+ qmlRegisterType<QQuickLabel, 5>(uri, 2, 5, "Label");
+ qmlRegisterType<QQuickPage, 5>(uri, 2, 5, "Page");
+ qmlRegisterType<QQuickPopup, 5>(uri, 2, 5, "Popup");
+ qmlRegisterType<QQuickPopupAnchors>();
+ qmlRegisterType<QQuickRangeSlider, 5>(uri, 2, 5, "RangeSlider");
+ qmlRegisterType<QQuickSlider, 5>(uri, 2, 5, "Slider");
+ qmlRegisterType<QQuickSpinBox, 5>(uri, 2, 5, "SpinBox");
+ qmlRegisterType<QQuickTextArea, 5>(uri, 2, 5, "TextArea");
+ qmlRegisterType<QQuickTextField, 5>(uri, 2, 5, "TextField");
+ qmlRegisterType<QQuickToolTip, 5>(uri, 2, 5, "ToolTip");
}
QT_END_NAMESPACE
diff --git a/src/imports/templates/templates.pro b/src/imports/templates/templates.pro
index b505dceb..b132f47d 100644
--- a/src/imports/templates/templates.pro
+++ b/src/imports/templates/templates.pro
@@ -1,6 +1,6 @@
TARGET = qtquicktemplates2plugin
TARGETPATH = QtQuick/Templates.2
-IMPORT_VERSION = 2.4
+IMPORT_VERSION = 2.5
QT += qml quick
QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 19:15:28 +0000