diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-22 11:27:54 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-22 13:11:49 +0200 |
| commit | 328759cdeb7b45eba5569b54ded35e38152ee0d0 (patch) | |
| tree | feac5f52693441217836ff42d379aa6b7c3869bb /src/qmlcompiler/qqmljstypereader.cpp | |
| parent | c0063f73e5472f770133602ea2a7c6fe77f5a1b3 (diff) | |
QmlCompiler: Properly discern between inherited and own names
Previously, we would mix them up on importExportedNames(), which was
also misnamed. Now we keep them in their proper place in the scope
hierarchy, so that we can identify which scope a property came from.
Exceptions are the qmllint-specific treatment of parent properties and
Connections elements.
Change-Id: I7c012388b16c83439d6f2de2e83fac0da4940d30
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmlcompiler/qqmljstypereader.cpp')
| -rw-r--r-- | src/qmlcompiler/qqmljstypereader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmlcompiler/qqmljstypereader.cpp b/src/qmlcompiler/qqmljstypereader.cpp index 578b0378c3..2c45bb01d6 100644 --- a/src/qmlcompiler/qqmljstypereader.cpp +++ b/src/qmlcompiler/qqmljstypereader.cpp @@ -51,7 +51,7 @@ static QQmlJSScope::Ptr parseProgram(QQmlJS::AST::Program *program, const QStrin method.setMethodType(QQmlJSMetaMethod::Method); for (auto *parameters = function->formals; parameters; parameters = parameters->next) method.addParameter(parameters->element->bindingIdentifier.toString(), QString()); - result->addMethod(method); + result->addOwnMethod(method); } } return result; |