From 0bcf3f4485b912657e11f1ac560676c5538080fc Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 12 Nov 2020 17:23:24 +0100 Subject: 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 --- src/qmltyperegistrar/qmltypescreator.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') 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")) { -- cgit v1.2.3