diff options
| author | con <qtc-committer@nokia.com> | 2010-06-30 14:25:09 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-06-30 14:25:09 +0200 |
| commit | ede2a7c97599886aa0ce7d36502b8d7966d78a77 (patch) | |
| tree | 194495903d59c542d5db00c8bcc18710fdc7b3eb /src/libs/qmljs/qmljslink.cpp | |
| parent | 82cc4b430209bbdfccc4acecc4253327870fb161 (diff) | |
| parent | 21b211fed0ae36de57dbfb9ca60239dd259b9a60 (diff) | |
| download | qt-creator-ede2a7c97599886aa0ce7d36502b8d7966d78a77.tar.gz | |
Merge remote branch 'origin/2.0'
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
Diffstat (limited to 'src/libs/qmljs/qmljslink.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljslink.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index 9f5c29a3c8..41e713e62a 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -54,8 +54,6 @@ void Link::initializeScopeChain() QHash<Document *, ScopeChain::QmlComponentChain *> componentScopes; if (_doc->qmlProgram()) { - _context->setLookupMode(Context::QmlLookup); - scopeChain.qmlComponentScope.clear(); componentScopes.insert(_doc.data(), &scopeChain.qmlComponentScope); makeComponentChain(_doc, &scopeChain.qmlComponentScope, &componentScopes); |