From 06b332fe74cd2dc6ae424edc84f06ea38d5b898e Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 7 Apr 2021 13:01:53 +0200 Subject: When resolving property types, also update the property type names Otherwise we end up with a mixture of QML and C++ names. Task-number: QTBUG-92447 Change-Id: I94c44307d8dd762d11cfd8f178f33ab6a895ee83 Reviewed-by: Fabian Kosmale (cherry picked from commit 4beba3a2b68a389c426791dd43c638f3539d8f20) --- tools/qmllint/checkidentifiers.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/qmllint/checkidentifiers.cpp b/tools/qmllint/checkidentifiers.cpp index 5136242059..1dd43613c6 100644 --- a/tools/qmllint/checkidentifiers.cpp +++ b/tools/qmllint/checkidentifiers.cpp @@ -58,10 +58,7 @@ private: static const QStringList unknownBuiltins = { QStringLiteral("alias"), // TODO: we cannot properly resolve aliases, yet QStringLiteral("QJSValue"), // We cannot say anything intelligent about untyped JS values. - - // Same for generic variants - QStringLiteral("variant"), - QStringLiteral("var") + QStringLiteral("QVariant") // Same for generic variants }; void CheckIdentifiers::printContext( -- cgit v1.2.3