From f1b5fb6e117aa9855080f2a3d1251c826f576ae6 Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Wed, 19 Jul 2023 14:10:12 +0200 Subject: [PATCH] Add interface to check incompatible qml ids Task-number: QDS-10121 Change-Id: I112bee4e9323dc4eff30ec7a4693c1e9632d6ba9 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Thomas Hartmann --- src/libs/qmljs/qmljscheck.cpp | 7 ++++++- src/libs/qmljs/qmljscheck.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index f1e72a7dc24..05273c579ae 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -680,6 +680,11 @@ QList Check::defaultDisabledMessagesForNonQuickUi() return disabled; } +bool Check::incompatibleDesignerQmlId(const QString &id) +{ + return idsThatShouldNotBeUsedInDesigner->contains(id); +} + Check::Check(Document::Ptr doc, const ContextPtr &context, Utils::QtcSettings *qtcSettings) : _doc(doc) , _context(context) @@ -1099,7 +1104,7 @@ bool Check::visit(UiScriptBinding *ast) return false; } - if (idsThatShouldNotBeUsedInDesigner->contains(id)) { + if (incompatibleDesignerQmlId(id)) { addMessage(ErrInvalidIdeInVisualDesigner, loc); } diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h index 60484fc43f1..1fb96d251b5 100644 --- a/src/libs/qmljs/qmljscheck.h +++ b/src/libs/qmljs/qmljscheck.h @@ -39,6 +39,7 @@ public: static QList defaultDisabledMessages(); static QList defaultDisabledMessagesForNonQuickUi(); + static bool incompatibleDesignerQmlId(const QString &id); protected: bool preVisit(AST::Node *ast) override;