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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
This commit is contained in:
con
2010-06-30 14:25:09 +02:00
parent 82cc4b4302 21b211fed0
commit ede2a7c975
43 changed files with 13792 additions and 2543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,12 +270,6 @@ private:
class QMLJS_EXPORT Context
{
public:
enum LookupMode {
JSLookup,
QmlLookup
};
public:
Context(Engine *engine);
~Context();
@@ -284,9 +278,6 @@ public:
const ScopeChain &scopeChain() const;
ScopeChain &scopeChain();
LookupMode lookupMode() const;
void setLookupMode(LookupMode lookupMode);
const ObjectValue *typeEnvironment(const Document *doc) const;
void setTypeEnvironment(const Document *doc, const ObjectValue *typeEnvironment);
@@ -307,7 +298,6 @@ private:
typedef QHash<QString, const Value *> Properties;
Engine *_engine;
LookupMode _lookupMode;
QHash<const ObjectValue *, Properties> _properties;
QHash<QString, const ObjectValue *> _typeEnvironments;
QSet<QString> _documentsImportingPlugins;