From 9bcc7df9ee8860cb469c1f6b701681e4eade9305 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 4 Apr 2018 10:11:51 +0200
Subject: Ensure that QQuickIcon is properly registered

This is required to avoid false positives about
e.g. icon.source.
Note: I had issues when dumping controls. Certain types
were not part of plugins.qmltypes anymore. I fixed that manually.

Task-number: QTBUG-66625
Change-Id: I802b427efee5c27720c99c537ddb4690f74449fd
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 src/imports/controls/plugins.qmltypes             | 10 ++++++++++
 src/imports/templates/plugins.qmltypes            |  8 ++++++++
 src/imports/templates/qtquicktemplates2plugin.cpp |  1 +
 3 files changed, 19 insertions(+)

diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index 8b2be4a1..c1d3388c 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"
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes
index ed609c1f..f4d03f6e 100644
--- a/src/imports/templates/plugins.qmltypes
+++ b/src/imports/templates/plugins.qmltypes
@@ -566,6 +566,14 @@ 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"
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index 72e84c3a..ec61b07c 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -298,6 +298,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");
-- 
cgit v1.2.3