1 files changed, 24 insertions, 24 deletions

diff --git a/tests/auto/qml/qmllint/lintplugin.cpp b/tests/auto/qml/qmllint/lintplugin.cpp
index 47279adcaa..65795c103c 100644
--- a/tests/auto/qml/qmllint/lintplugin.cpp
+++ b/tests/auto/qml/qmllint/lintplugin.cpp
@@ -1,11 +1,11 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "lintplugin.h"
 
 using namespace Qt::StringLiterals;
 
-static constexpr LoggerWarningId plugin { "testPlugin.test" };
+static constexpr QQmlSA::LoggerWarningId plugin{ "testPlugin.test" };
 
 class ElementTest : public QQmlSA::ElementPass
 {
@@ -17,25 +17,25 @@ public:
 
     bool shouldRun(const QQmlSA::Element &element) override
     {
-        return element->baseType() == m_rectangle;
+        return element.baseType() == m_rectangle;
     }
 
     void run(const QQmlSA::Element &element) override
     {
-        auto property = element->property(u"radius"_s);
-        if (!property.isValid() || element->property(u"radius"_s).typeName() != u"double") {
-            emitWarning(u"Failed to verify radius property", plugin, element->sourceLocation());
+        auto property = element.property(u"radius"_s);
+        if (!property.isValid() || element.property(u"radius"_s).typeName() != u"qreal") {
+            emitWarning(u"Failed to verify radius property", plugin, element.sourceLocation());
             return;
         }
 
-        auto bindings = element->propertyBindings(u"radius"_s);
+        auto bindings = element.propertyBindings(u"radius"_s);
         if (bindings.isEmpty() || bindings.constFirst().numberValue() != 5) {
             emitWarning(u"Failed to verify radius property binding", plugin,
-                        element->sourceLocation());
+                        element.sourceLocation());
             return;
         }
 
-        emitWarning(u"ElementTest OK", plugin, element->sourceLocation());
+        emitWarning(u"ElementTest OK", plugin, element.sourceLocation());
     }
 
 private:
@@ -48,37 +48,37 @@ public:
     PropertyTest(QQmlSA::PassManager *manager) : QQmlSA::PropertyPass(manager) { }
 
     void onBinding(const QQmlSA::Element &element, const QString &propertyName,
-                   const QQmlJSMetaPropertyBinding &binding, const QQmlSA::Element &bindingScope,
+                   const QQmlSA::Binding &binding, const QQmlSA::Element &bindingScope,
                    const QQmlSA::Element &value) override
     {
         emitWarning(u"Saw binding on %1 property %2 with value %3 (and type %4) in scope %5"_s
-                            .arg(element->baseTypeName(), propertyName,
+                            .arg(element.baseTypeName(), propertyName,
                                  value.isNull()
                                          ? u"NULL"_s
-                                         : (value->internalName().isNull() ? value->baseTypeName()
-                                                                           : value->baseTypeName()))
-                            .arg(binding.bindingType())
-                            .arg(bindingScope->baseTypeName()),
-                    plugin, bindingScope->sourceLocation());
+                                         : (value.name().isNull() ? value.baseTypeName()
+                                                                  : value.name()))
+                            .arg(qToUnderlying(binding.bindingType()))
+                            .arg(bindingScope.baseTypeName()),
+                    plugin, bindingScope.sourceLocation());
     }
 
     void onRead(const QQmlSA::Element &element, const QString &propertyName,
-                const QQmlSA::Element &readScope, QQmlJS::SourceLocation location) override
+                const QQmlSA::Element &readScope, QQmlSA::SourceLocation location) override
     {
         emitWarning(u"Saw read on %1 property %2 in scope %3"_s.arg(
-                            element->baseTypeName(), propertyName, readScope->baseTypeName()),
+                            element.baseTypeName(), propertyName, readScope.baseTypeName()),
                     plugin, location);
     }
 
     void onWrite(const QQmlSA::Element &element, const QString &propertyName,
                  const QQmlSA::Element &value, const QQmlSA::Element &writeScope,
-                 QQmlJS::SourceLocation location) override
+                 QQmlSA::SourceLocation location) override
     {
         emitWarning(u"Saw write on %1 property %2 with value %3 in scope %4"_s.arg(
-                            element->baseTypeName(), propertyName,
-                            (value->internalName().isNull() ? value->baseTypeName()
-                                                            : value->internalName()),
-                            writeScope->baseTypeName()),
+                            element.baseTypeName(), propertyName,
+                            (value.name().isNull() ? value.baseTypeName()
+                                                   : value.name()),
+                            writeScope.baseTypeName()),
                     plugin, location);
     }
 };
@@ -109,7 +109,7 @@ private:
 
 void LintPlugin::registerPasses(QQmlSA::PassManager *manager, const QQmlSA::Element &rootElement)
 {
-    if (!rootElement->filePath().endsWith(u"_pluginTest.qml"))
+    if (!rootElement.filePath().endsWith(u"_pluginTest.qml"))
         return;
 
     manager->registerElementPass(std::make_unique<ElementTest>(manager));