diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-11-26 10:01:56 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-11-26 10:02:56 +0100 |
| commit | ee6aa999ab0439dcb7a95af3dc9905a6daf13491 (patch) | |
| tree | 8c83fc72ce62676b8431a1226f9cb9d6f39da4a0 /src/qml/compiler/qqmlcodegenerator_p.h | |
| parent | f449534020adc8623ebfced5daae331ef56c4421 (diff) | |
| parent | ce38c71b1c300f700a9ff004b7c163cc290ecae9 (diff) | |
Merge branch 'release' of ssh://codereview.qt-project.org/qt/qtdeclarative into stable
Change-Id: I0bf06be69927d5961f1bdb4948c3572ef6111923
Diffstat (limited to 'src/qml/compiler/qqmlcodegenerator_p.h')
| -rw-r--r-- | src/qml/compiler/qqmlcodegenerator_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/compiler/qqmlcodegenerator_p.h b/src/qml/compiler/qqmlcodegenerator_p.h index 636f2827bb..f16f910078 100644 --- a/src/qml/compiler/qqmlcodegenerator_p.h +++ b/src/qml/compiler/qqmlcodegenerator_p.h @@ -369,6 +369,8 @@ protected: virtual V4IR::Expr *fallbackNameLookup(const QString &name, int line, int col); private: + QQmlPropertyData *lookupQmlCompliantProperty(QQmlPropertyCache *cache, const QString &name, bool *propertyExistsButForceNameLookup = 0); + QQmlEnginePrivate *engine; QString sourceCode; QQmlJS::Engine *jsEngine; // needed for memory pool |