feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.4'

Browse Source 
Change-Id: I35ba4cc7f7052699c3006545514c866be3cb5fdd
This commit is contained in:
Eike Ziller
2015-05-26 15:12:42 +02:00
parent 03b92050e0 b8038191e6
commit 3858c33d74
38 changed files with 330 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -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: