From 4b24a61ecc4a1dbd5f8d32c2078ccdaf53c134d1 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 5 Mar 2018 13:04:46 +0100 Subject: uic: Add the include for QIcon conditionally Task-number: QTBUG-66753 Change-Id: I31bd821396b59c8e83e19e02634cf1440a271215 Reviewed-by: Friedemann Kleint --- src/tools/uic/cpp/cppwriteincludes.cpp | 2 ++ src/tools/uic/qclass_lib_map.h | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'src') 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) -- cgit v1.2.3