QmlDesigner.rewriterView: setupImports even if semantic checks fail

Change-Id: Idb243372f4c639c91ea3085c3fdf916758ddcf49
Reviewed-on: http://codereview.qt.nokia.com/485
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 16026a1..41d564d 100644 (file)
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -746,6 +746,8 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
             errors.append(RewriterView::Error(diagnosticMessage, QUrl::fromLocalFile(doc->fileName())));
         }
 
+        setupImports(doc, differenceHandler);
+
         if (view()->checkSemanticErrors()) {
             Check check(doc, m_lookupContext->context());
             check.setOptions(check.options() & ~Check::ErrCheckTypeErrors);
@@ -760,8 +762,6 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
             }
         }
 
-        setupImports(doc, differenceHandler);
-
         UiObjectMember *astRootNode = 0;
         if (UiProgram *program = doc->qmlProgram())
             if (program->members)