From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Thu, 9 Dec 2010 08:41:43 +0000 (+0100)
Subject: QmlJS: Set default import paths in constructor.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e641bfbd9adcf7e0c3dc3b5da4c4b0d1576bc540;p=qt-creator-jp%2Fqt-creator-jp.git

QmlJS: Set default import paths in constructor.

Also, remove the import path of the Qt that Creator was built with. It
might make things seem to work on built-from-source Creators that will
fail when Creator is shipped.

Reviewed-by: Erik Verbruggen
---

diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index 0165eb64cb..8f9793c339 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -74,7 +74,7 @@ ModelManager::ModelManager(QObject *parent):
     loadQmlTypeDescriptions();
 
     m_defaultImportPaths << environmentImportPaths();
-    m_defaultImportPaths << QLibraryInfo::location(QLibraryInfo::ImportsPath);
+    updateImportPaths();
 }
 
 void ModelManager::loadQmlTypeDescriptions()