aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/templates
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/templates')
-rw-r--r--src/imports/templates/plugins.qmltypes10
-rw-r--r--src/imports/templates/qtquicktemplates2plugin.cpp1
2 files changed, 10 insertions, 1 deletions
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes
index ed609c1f..0283f50d 100644
--- a/src/imports/templates/plugins.qmltypes
+++ b/src/imports/templates/plugins.qmltypes
@@ -567,6 +567,14 @@ Module {
Property { name: "label"; type: "QQuickItem"; isPointer: true }
}
Component {
+ name: "QQuickIcon"
+ Property { name: "name"; type: "string" }
+ Property { name: "source"; type: "QUrl" }
+ Property { name: "width"; type: "int" }
+ Property { name: "height"; type: "int" }
+ Property { name: "color"; type: "QColor" }
+ }
+ Component {
name: "QQuickItemDelegate"
defaultProperty: "data"
prototype: "QQuickAbstractButton"
@@ -1261,7 +1269,7 @@ Module {
Property { name: "busy"; type: "bool"; isReadonly: true }
Property { name: "depth"; type: "int"; isReadonly: true }
Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
- Property { name: "initialItem"; type: "QVariant" }
+ Property { name: "initialItem"; type: "QJSValue" }
Property { name: "popEnter"; type: "QQuickTransition"; isPointer: true }
Property { name: "popExit"; type: "QQuickTransition"; isPointer: true }
Property { name: "pushEnter"; type: "QQuickTransition"; isPointer: true }
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index 81330447..ace2b316 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -299,6 +299,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
qmlRegisterType<QQuickContainer, 3>(uri, 2, 3, "Container");
qmlRegisterType<QQuickDialog, 3>(uri, 2, 3, "Dialog");
qmlRegisterType<QQuickDialogButtonBox, 3>(uri, 2, 3, "DialogButtonBox");
+ qmlRegisterType<QQuickIcon>();
qRegisterMetaType<QQuickIcon>();
qmlRegisterType<QQuickLabel, 3>(uri, 2, 3, "Label");
qmlRegisterType<QQuickMenu, 3>(uri, 2, 3, "Menu");