From 71b9057b0b4904b97d87db155c90254ce0e52fb2 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Mon, 26 Apr 2010 10:40:18 +0200
Subject: [PATCH] QmlJS: The qml document's path is no longer an implicit
 import path.

---
 src/libs/qmljs/qmljslink.cpp                  | 4 +---
 src/plugins/qmljseditor/qmljsmodelmanager.cpp | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp
index 6efea8b6f02..3a854647677 100644
--- a/src/libs/qmljs/qmljslink.cpp
+++ b/src/libs/qmljs/qmljslink.cpp
@@ -275,9 +275,7 @@ void Link::importNonFile(Interpreter::ObjectValue *typeEnv, Document::Ptr doc, A
     } else {
         // check the filesystem
         const QString packagePath = Bind::toString(import->importUri, QDir::separator());
-        QStringList localImportPaths = _importPaths;
-        localImportPaths.prepend(doc->path());
-        foreach (const QString &importPath, localImportPaths) {
+        foreach (const QString &importPath, _importPaths) {
             QDir dir(importPath);
             if (!dir.cd(packagePath))
                 continue;
diff --git a/src/plugins/qmljseditor/qmljsmodelmanager.cpp b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
index a253c99530b..58f44fb07fc 100644
--- a/src/plugins/qmljseditor/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
@@ -245,8 +245,7 @@ static void findNewLibraryImports(const Document::Ptr &doc, const Snapshot &snap
                            QStringList *importedFiles, QSet<QString> *scannedPaths)
 {
     // scan library imports
-    QStringList importPaths = modelManager->importPaths();
-    importPaths.prepend(doc->path());
+    const QStringList importPaths = modelManager->importPaths();
     foreach (const QString &libraryImport, doc->bind()->libraryImports()) {
         foreach (const QString &importPath, importPaths) {
             QDir dir(importPath);