diff options
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 7 | ||||
| -rw-r--r-- | src/dbus/qdbusmisc.cpp | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index a39c22b780..44cdcb3008 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -214,11 +214,10 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId(); F(UInt, -1, uint, "quint32") \ F(LongLong, -1, qlonglong, "qint64") \ F(ULongLong, -1, qulonglong, "quint64") \ - F(QVariantList, -1, QVariantList, "QVector<QVariant>") \ F(QVariantList, -1, QVariantList, "QList<QVariant>") \ F(QVariantMap, -1, QVariantMap, "QMap<QString,QVariant>") \ F(QVariantHash, -1, QVariantHash, "QHash<QString,QVariant>") \ - F(QByteArrayList, -1, QByteArrayList, "QVector<QByteArray>") \ + F(QByteArrayList, -1, QByteArrayList, "QList<QByteArray>") \ #define QT_FOR_EACH_STATIC_TYPE(F)\ QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(F)\ @@ -928,8 +927,8 @@ struct ContainerAPI : CapabilitiesImpl<T> }; template<typename T> -struct ContainerAPI<QVector<T> > : CapabilitiesImpl<QVector<T> > -{ static int size(const QVector<T> *t) { return t->size(); } }; +struct ContainerAPI<QList<T>> : CapabilitiesImpl<QList<T>> +{ static int size(const QList<T> *t) { return t->size(); } }; template<typename T> struct ContainerAPI<std::vector<T> > : CapabilitiesImpl<std::vector<T> > diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp index 1925331eae..ba98184ded 100644 --- a/src/dbus/qdbusmisc.cpp +++ b/src/dbus/qdbusmisc.cpp @@ -181,8 +181,8 @@ int qDBusParametersForMethod(const QList<QByteArray> ¶meterTypes, QList<int> return -1; // not allowed } - if (type.startsWith("QList<")) - type = "QVector<" + type.mid(sizeof("QList<") - 1); + if (type.startsWith("QVector<")) + type = "QList<" + type.mid(sizeof("QVector<") - 1); int id = QMetaType::type(type); #ifdef QT_BOOTSTRAPPED |