From d05992d0fa36fdba45a159491abf8fccf3622a0e Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 6 May 2011 13:31:30 +0200
Subject: QmlJS: Stop doing significant work in constructors.

To avoid order-of-initialization problems.

Reviewed-by: Thomas Hartmann
---
 src/libs/qmljs/qmljsscopebuilder.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/libs/qmljs/qmljsscopebuilder.cpp')

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
-- 
cgit v1.2.1