summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-01-27 14:04:12 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-29 14:34:12 +0100
commit36c057787f8a94abbfd3796e5039cf4e2db3775a (patch)
tree09e98b39d316135a6127f2006db0a3814e96cd45 /src/tools
parent889092504e0f1e67dc9c7f27817fb809d7170132 (diff)
Get rid of checks for Qt3 types
These types don't exist anymore, so it's pointless to check for them. Also remove the dead types from uic's type-to-header map. Change-Id: I7f0af5c337859f3da1c103157a802bbe5372df9f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/moc/generator.cpp9
-rw-r--r--src/tools/uic/qclass_lib_map.h13
2 files changed, 0 insertions, 22 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index dc902ece33..51afd6d0b1 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -54,15 +54,6 @@ uint qvariant_nameToType(const char* name)
if (!name)
return 0;
- if (strcmp(name, "QCString") == 0)
- return QMetaType::QByteArray;
- if (strcmp(name, "Q_LLONG") == 0)
- return QMetaType::LongLong;
- if (strcmp(name, "Q_ULLONG") == 0)
- return QMetaType::ULongLong;
- if (strcmp(name, "QIconSet") == 0)
- return QMetaType::QIcon;
-
uint tp = QMetaType::type(name);
return tp < QMetaType::User ? tp : 0;
}
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index df953d62d8..71f879175a 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -33,20 +33,8 @@ QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
QT_CLASS_LIB(QNoImplicitBoolCast, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_INT8, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_UINT8, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_INT16, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_UINT16, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_INT32, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_UINT32, QtCore, qglobal.h)
QT_CLASS_LIB(Q_INT64, QtCore, qglobal.h)
QT_CLASS_LIB(Q_UINT64, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_LLONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_ULLONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
QT_CLASS_LIB(QSysInfo, QtCore, qglobal.h)
QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h)
QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
@@ -670,7 +658,6 @@ 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(QIconSet, QtWidgets, qicon.h)
QT_CLASS_LIB(QIconEngine, QtWidgets, qiconengine.h)
QT_CLASS_LIB(QIconEngineV2, QtWidgets, qiconengine.h)
QT_CLASS_LIB(QIconEngineFactoryInterface, QtWidgets, qiconengineplugin.h)