whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uic: Add the include for QIcon conditionally 

Task-number: QTBUG-66753
Change-Id: I31bd821396b59c8e83e19e02634cf1440a271215
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
bb10
Jarek Kobus 2018-03-05 13:04:46 +01:00
parent a4e67a303b
commit 4b24a61ecc
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/uic/cpp/cppwriteincludes.cpp
View File

@ -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);
}

14
src/tools/uic/qclass_lib_map.h
View File

@ -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)

1
tests/auto/tools/uic/baseline/icontheme.ui.h
View File

@ -10,6 +10,7 @@
#define ICONTHEME_H
#include <QtCore/QVariant>
#include <QtGui/QIcon>
#include <QtWidgets/QApplication>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QVBoxLayout>

1
tests/auto/tools/uic/baseline/languagesdialog.ui.h
View File

@ -10,6 +10,7 @@
#define LANGUAGESDIALOG_H
#include <QtCore/QVariant>
#include <QtGui/QIcon>
#include <QtWidgets/QApplication>
#include <QtWidgets/QDialog>
#include <QtWidgets/QHBoxLayout>

1
tests/auto/tools/uic/baseline/qttrid.ui.h
View File

@ -10,6 +10,7 @@
#define QTTRID_H
#include <QtCore/QVariant>
#include <QtGui/QIcon>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
#include <QtWidgets/QCheckBox>

1
tests/auto/tools/uic/baseline/remotecontrol.ui.h
View File

@ -10,6 +10,7 @@
#define REMOTECONTROL_H
#include <QtCore/QVariant>
#include <QtGui/QIcon>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
#include <QtWidgets/QCheckBox>

1
tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
View File

@ -40,6 +40,7 @@
#define TABBEDBROWSER_H
#include <QtCore/QVariant>
#include <QtGui/QIcon>
#include <QtWidgets/QApplication>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QFrame>