aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmllint/findwarnings.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/qmllint/findwarnings.cpp')
-rw-r--r--tools/qmllint/findwarnings.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmllint/findwarnings.cpp b/tools/qmllint/findwarnings.cpp
index 62dce68bb7..962ccaa1c6 100644
--- a/tools/qmllint/findwarnings.cpp
+++ b/tools/qmllint/findwarnings.cpp
@@ -473,7 +473,7 @@ bool FindWarningVisitor::check()
// now that all ids are known, revisit any Connections whose target were perviously unknown
for (auto const &outstandingConnection: m_outstandingConnections) {
auto targetScope = m_qmlid2scope[outstandingConnection.targetName];
- if (outstandingConnection.scope && targetScope != nullptr)
+ if (outstandingConnection.scope && !targetScope.isNull())
outstandingConnection.scope->addMethods(targetScope->methods());
QScopedValueRollback<QQmlJSScope::Ptr> rollback(m_currentScope, outstandingConnection.scope);
outstandingConnection.uiod->initializer->accept(this);
@@ -632,7 +632,7 @@ bool FindWarningVisitor::visit(QQmlJS::AST::UiObjectBinding *uiob)
void FindWarningVisitor::endVisit(QQmlJS::AST::UiObjectBinding *uiob)
{
- const auto childScope = m_currentScope;
+ const QQmlJSScope::ConstPtr childScope = m_currentScope;
leaveEnvironment();
QQmlJSMetaProperty property(uiob->qualifiedId->name.toString(),
uiob->qualifiedTypeNameId->name.toString(),
@@ -736,7 +736,7 @@ void FindWarningVisitor::endVisit(QQmlJS::AST::UiObjectDefinition *)
const auto it = properties.find(QStringLiteral("parent"));
if (it != properties.end()) {
auto property = *it;
- property.setType(m_currentScope);
+ property.setType(QQmlJSScope::ConstPtr(m_currentScope));
childScope->addProperty(property);
}
}