diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-05-06 13:31:30 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-05-06 13:48:55 +0200 |
| commit | d05992d0fa36fdba45a159491abf8fccf3622a0e (patch) | |
| tree | 522d270209246411e96df55f745ffc31066c6100 /src/libs/qmljs/qmljsscopebuilder.cpp | |
| parent | 6ea355add165ef78eba33ad1d5240c60757e51bb (diff) | |
| download | qt-creator-d05992d0fa36fdba45a159491abf8fccf3622a0e.tar.gz | |
QmlJS: Stop doing significant work in constructors.
To avoid order-of-initialization problems.
Reviewed-by: Thomas Hartmann
Diffstat (limited to 'src/libs/qmljs/qmljsscopebuilder.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsscopebuilder.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp index 35e4d6d66e..49888c1515 100644 --- a/src/libs/qmljs/qmljsscopebuilder.cpp +++ b/src/libs/qmljs/qmljsscopebuilder.cpp @@ -45,7 +45,6 @@ ScopeBuilder::ScopeBuilder(Context *context, Document::Ptr doc) : _doc(doc) , _context(context) { - initializeScopeChain(); } ScopeBuilder::~ScopeBuilder() @@ -98,7 +97,7 @@ void ScopeBuilder::pop() _context->scopeChain().update(); } -void ScopeBuilder::initializeScopeChain() +void ScopeBuilder::initializeRootScope() { ScopeChain &scopeChain = _context->scopeChain(); if (scopeChain.qmlComponentScope |