Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I509cd2e02874d9a2fe0febf8cc667833b7072b23

4 files changed, 23 insertions, 4 deletions

diff --git a/src/imports/controls/doc/src/includes/qquickoverlay-popup-parent.qdocinc b/src/imports/controls/doc/src/includes/qquickoverlay-popup-parent.qdocinc
index 7ad8a003..5562f6a0 100644
--- a/src/imports/controls/doc/src/includes/qquickoverlay-popup-parent.qdocinc
+++ b/src/imports/controls/doc/src/includes/qquickoverlay-popup-parent.qdocinc
@@ -11,8 +11,8 @@ Button {
 
         parent: Overlay.overlay
 
-        x: (parent.width - width) / 2
-        y: (parent.height - height) / 2
+        x: Math.round((parent.width - width) / 2)
+        y: Math.round((parent.height - height) / 2)
         width: 100
         height: 100
     }
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index 8b2be4a1..5011365c 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -1208,6 +1208,16 @@ Module {
         Property { name: "title"; type: "string" }
         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"
@@ -1903,7 +1913,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/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");