diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-11-12 17:23:24 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-11-12 21:24:13 +0100 |
| commit | 0bcf3f4485b912657e11f1ac560676c5538080fc (patch) | |
| tree | 779fac5d0973f875eabcac06a2fd3fe53fbdc0a3 | |
| parent | 756d50e2127d9ac32b99cd1ed3471a3915c0de7f (diff) | |
qmltyperegistrar: Use QString rather than string for strings
All other type names are actual C++ type names. Also, correctly resolve
qreal if its type is overridden at configure time.
Change-Id: Ia2a1b4309f94e8c72461ee69005b1bdee6337370
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/qmltyperegistrar/qmltypescreator.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp index 9e1e757b69..df257d1f53 100644 --- a/src/qmltyperegistrar/qmltypescreator.cpp +++ b/src/qmltyperegistrar/qmltypescreator.cpp @@ -114,10 +114,12 @@ void QmlTypesCreator::writeType(const QJsonObject &property, const QString &key, bool isList = false; bool isPointer = false; - if (type == QLatin1String("QString")) { - type = QLatin1String("string"); - } else if (type == QLatin1String("qreal")) { + if (type == QLatin1String("qreal")) { +#ifdef QT_COORD_TYPE_STRING + type = QLatin1String(QT_COORD_TYPE_STRING) +#else type = QLatin1String("double"); +#endif } else if (type == QLatin1String("qint32")) { type = QLatin1String("int"); } else if (type == QLatin1String("quint32")) { diff --git a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp index 77f1f3b9cf..3d3a0e7fbd 100644 --- a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp +++ b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp @@ -81,7 +81,7 @@ void tst_qmltyperegistrar::superAndForeignTypes() QVERIFY(qmltypesData.contains("prototype: \"SizeEnums\"")); QVERIFY(qmltypesData.contains("Property { name: \"height\"; type: \"int\" }")); QVERIFY(qmltypesData.contains("Property { name: \"width\"; type: \"int\" }")); - QVERIFY(qmltypesData.contains("Method { name: \"sizeToString\"; type: \"string\" }")); + QVERIFY(qmltypesData.contains("Method { name: \"sizeToString\"; type: \"QString\" }")); } void tst_qmltyperegistrar::accessSemantics() |