uic: Add the include for QIcon conditionally

Task-number: QTBUG-66753
Change-Id: I31bd821396b59c8e83e19e02634cf1440a271215
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

7 files changed, 14 insertions, 7 deletions

diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 0ba9d28642..d51fddffea 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -150,6 +150,8 @@ void WriteIncludes::acceptProperty(DomProperty *node)
         add(QLatin1String("QDate"));
     if (node->kind() == DomProperty::Locale)
         add(QLatin1String("QLocale"));
+    if (node->kind() == DomProperty::IconSet)
+        add(QLatin1String("QIcon"));
     TreeWalker::acceptProperty(node);
 }
 
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 810b326b30..8e1afa0878 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -628,13 +628,13 @@ QT_CLASS_LIB(QGraphicsRotation, QtWidgets, qgraphicstransform.h)
 QT_CLASS_LIB(QGraphicsView, QtWidgets, qgraphicsview.h)
 QT_CLASS_LIB(QGraphicsWidget, QtWidgets, qgraphicswidget.h)
 QT_CLASS_LIB(QBitmap, QtGui, qbitmap.h)
-QT_CLASS_LIB(QIcon, QtWidgets, qicon.h)
-QT_CLASS_LIB(QIconEngine, QtWidgets, qiconengine.h)
-QT_CLASS_LIB(QIconEngineV2, QtWidgets, qiconengine.h)
-QT_CLASS_LIB(QIconEngineFactoryInterface, QtWidgets, qiconengineplugin.h)
-QT_CLASS_LIB(QIconEnginePlugin, QtWidgets, qiconengineplugin.h)
-QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtWidgets, qiconengineplugin.h)
-QT_CLASS_LIB(QIconEnginePluginV2, QtWidgets, qiconengineplugin.h)
+QT_CLASS_LIB(QIcon, QtGui, qicon.h)
+QT_CLASS_LIB(QIconEngine, QtGui, qiconengine.h)
+QT_CLASS_LIB(QIconEngineV2, QtGui, qiconengine.h)
+QT_CLASS_LIB(QIconEngineFactoryInterface, QtGui, qiconengineplugin.h)
+QT_CLASS_LIB(QIconEnginePlugin, QtGui, qiconengineplugin.h)
+QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtGui, qiconengineplugin.h)
+QT_CLASS_LIB(QIconEnginePluginV2, QtGui, qiconengineplugin.h)
 QT_CLASS_LIB(QImageTextKeyLang, QtGui, qimage.h)
 QT_CLASS_LIB(QImage, QtGui, qimage.h)
 QT_CLASS_LIB(QImageIOHandler, QtGui, qimageiohandler.h)
diff --git a/tests/auto/tools/uic/baseline/icontheme.ui.h b/tests/auto/tools/uic/baseline/icontheme.ui.h
index 94122c01de..75a1b648cd 100644
--- a/tests/auto/tools/uic/baseline/icontheme.ui.h
+++ b/tests/auto/tools/uic/baseline/icontheme.ui.h
@@ -10,6 +10,7 @@
 #define ICONTHEME_H
 
 #include <QtCore/QVariant>
+#include <QtGui/QIcon>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QVBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/languagesdialog.ui.h b/tests/auto/tools/uic/baseline/languagesdialog.ui.h
index 981ff20cbf..6f722a4e74 100644
--- a/tests/auto/tools/uic/baseline/languagesdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/languagesdialog.ui.h
@@ -10,6 +10,7 @@
 #define LANGUAGESDIALOG_H
 
 #include <QtCore/QVariant>
+#include <QtGui/QIcon>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDialog>
 #include <QtWidgets/QHBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/qttrid.ui.h b/tests/auto/tools/uic/baseline/qttrid.ui.h
index 3893ef3569..b7ec1062de 100644
--- a/tests/auto/tools/uic/baseline/qttrid.ui.h
+++ b/tests/auto/tools/uic/baseline/qttrid.ui.h
@@ -10,6 +10,7 @@
 #define QTTRID_H
 
 #include <QtCore/QVariant>
+#include <QtGui/QIcon>
 #include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QCheckBox>
diff --git a/tests/auto/tools/uic/baseline/remotecontrol.ui.h b/tests/auto/tools/uic/baseline/remotecontrol.ui.h
index c3a563f235..c883637dc4 100644
--- a/tests/auto/tools/uic/baseline/remotecontrol.ui.h
+++ b/tests/auto/tools/uic/baseline/remotecontrol.ui.h
@@ -10,6 +10,7 @@
 #define REMOTECONTROL_H
 
 #include <QtCore/QVariant>
+#include <QtGui/QIcon>
 #include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QCheckBox>
diff --git a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
index 4ebbf3c435..5d670b46af 100644
--- a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
+++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
@@ -40,6 +40,7 @@
 #define TABBEDBROWSER_H
 
 #include <QtCore/QVariant>
+#include <QtGui/QIcon>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QCheckBox>
 #include <QtWidgets/QFrame>