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;
}
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;
}
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)
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)
QVERIFY( QVariant::nameToType( 0 ) == QVariant::Invalid );
QVERIFY( QVariant::nameToType( "" ) == QVariant::Invalid );
QVERIFY( QVariant::nameToType( "foo" ) == QVariant::Invalid );
- QCOMPARE(QVariant::nameToType("QIconSet"), QVariant::Icon);
+
+ // We don't support these old (Qt3) types anymore.
+ QCOMPARE(QVariant::nameToType("QIconSet"), QVariant::Invalid);
+ QCOMPARE(QVariant::nameToType("Q3CString"), QVariant::Invalid);
+ QCOMPARE(QVariant::nameToType("Q_LLONG"), QVariant::Invalid);
+ QCOMPARE(QVariant::nameToType("Q_ULLONG"), QVariant::Invalid);
}
void tst_QVariant::streamInvalidVariant()