diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 6799057080..c20fb5b6e0 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -682,7 +682,7 @@ static void argumentTypesFromString(const char *str, const char *end, ++str; } QByteArray argType(begin, str - begin); - argType.replace("QList<", "QVector<"); + argType.replace("QVector<", "QList<"); types += QArgumentType(std::move(argType)); } } diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 196df677e9..c7e754cb5c 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -232,7 +232,7 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId(); TypeName = Id, #define QT_FOR_EACH_AUTOMATIC_TEMPLATE_1ARG(F) \ - F(QVector) \ + F(QList) \ F(QQueue) \ F(QStack) \ F(QSet) \ @@ -2014,7 +2014,7 @@ typedef QHash<QString, QVariant> QVariantHash; #ifdef Q_CLANG_QDOC class QByteArrayList; #else -typedef QVector<QByteArray> QByteArrayList; +using QByteArrayList = QList<QByteArray>; #endif #define Q_DECLARE_METATYPE_TEMPLATE_1ARG(SINGLE_ARG_TEMPLATE) \ @@ -2515,9 +2515,9 @@ public: } #endif - if (skipToken(begin, end, "QList")) { - // Replace QList by QVector - appendStr("QVector"); + if (skipToken(begin, end, "QVector")) { + // Replace QVector by QList + appendStr("QList"); } if (skipToken(begin, end, "QPair")) { |