diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-06-22 13:35:59 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-06-29 08:31:42 +0000 |
| commit | e049377f366dad8f42a3a632be5b347b7f7b4af2 (patch) | |
| tree | 29f00126f0e066059dc408d5b0aa6e2e62b42082 /src/qml/compiler/qqmlirbuilder_p.h | |
| parent | 971c06eb5be7a671fbfe73eec24fd85a1038f5d4 (diff) | |
Fix bugs in qqmlirbuilder
Correctly add the scope and context object dependencies,
and pass the correct index into LoadIdObject.
Change-Id: Idc0d5b229fca40dad6a0ecd4988b4f150db4c0a2
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/compiler/qqmlirbuilder_p.h')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h index fbf9b07d3d..e212a8b333 100644 --- a/src/qml/compiler/qqmlirbuilder_p.h +++ b/src/qml/compiler/qqmlirbuilder_p.h @@ -606,8 +606,8 @@ protected: Reference fallbackNameLookup(const QString &name) override; private: - // returns -1 if lookup needs to happen by name - int lookupQmlCompliantProperty(QQmlPropertyCache *cache, const QString &name); + // returns nullptr if lookup needs to happen by name + QQmlPropertyData *lookupQmlCompliantProperty(QQmlPropertyCache *cache, const QString &name); QString sourceCode; QQmlJS::Engine *jsEngine; // needed for memory pool |