diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-05-26 15:12:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-05-26 15:12:42 +0200 |
| commit | 3858c33d741cc0bfb120d528b0f3465e665c4bd5 (patch) | |
| tree | c5fd6289f486a14e698940a40511fa4344a911da /src/libs/qmljs | |
| parent | 03b92050e03bbc51f1d49d7dbce8116f23a0c66e (diff) | |
| parent | b8038191e693f5649686d56b2192169ea1f53a25 (diff) | |
| download | qt-creator-3858c33d741cc0bfb120d528b0f3465e665c4bd5.tar.gz | |
Merge remote-tracking branch 'origin/3.4'
Change-Id: I35ba4cc7f7052699c3006545514c866be3cb5fdd
Diffstat (limited to 'src/libs/qmljs')
| -rw-r--r-- | src/libs/qmljs/qmljsinterpreter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index ed707cd163..f1add81b30 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -985,7 +985,7 @@ public: const ASTObjectValue *asAstObjectValue() const Q_DECL_OVERRIDE; - bool getSourceLocation(QString *fileName, int *line, int *column) const; + bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE; void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE; QString defaultPropertyName() const; @@ -1059,7 +1059,7 @@ public: virtual const Value *lookupMember(const QString &name, const Context *context, const ObjectValue **foundInObject = 0, - bool examinePrototypes = true) const; + bool examinePrototypes = true) const Q_DECL_OVERRIDE; void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE; const TypeScope *asTypeScope() const Q_DECL_OVERRIDE; private: @@ -1073,7 +1073,7 @@ public: virtual const Value *lookupMember(const QString &name, const Context *context, const ObjectValue **foundInObject = 0, - bool examinePrototypes = true) const; + bool examinePrototypes = true) const Q_DECL_OVERRIDE; void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE; const JSImportScope *asJSImportScope() const Q_DECL_OVERRIDE; private: |