From 3096b2a06fcc8ac597c744ed75c48d5c25858099 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Thu, 22 Apr 2010 16:32:28 +0200 Subject: QmlJS: Set importing scopes for scripts correctly. They had not yet been updated to the new way of importing javascript. Reviewed-by: Erik Verbruggen --- src/plugins/qmljseditor/qmljsmodelmanager.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/plugins/qmljseditor/qmljsmodelmanager.cpp') diff --git a/src/plugins/qmljseditor/qmljsmodelmanager.cpp b/src/plugins/qmljseditor/qmljsmodelmanager.cpp index d949424c5c..a253c99530 100644 --- a/src/plugins/qmljseditor/qmljsmodelmanager.cpp +++ b/src/plugins/qmljseditor/qmljsmodelmanager.cpp @@ -227,17 +227,14 @@ static void findNewFileImports(const Document::Ptr &doc, const Snapshot &snapsho { // scan files and directories that are explicitly imported foreach (const QString &fileImport, doc->bind()->fileImports()) { - const QFileInfo importFileInfo(doc->path() + QLatin1Char('/') + fileImport); - const QString &importFilePath = importFileInfo.absoluteFilePath(); - if (importFileInfo.isFile()) { - if (! snapshot.document(importFilePath)) - *importedFiles += importFilePath; - } else if (importFileInfo.isDir()) { - if (snapshot.documentsInDirectory(importFilePath).isEmpty()) { - if (! scannedPaths->contains(importFilePath)) { - *importedFiles += qmlFilesInDirectory(importFilePath); - scannedPaths->insert(importFilePath); - } + if (! snapshot.document(fileImport)) + *importedFiles += fileImport; + } + foreach (const QString &directoryImport, doc->bind()->directoryImports()) { + if (snapshot.documentsInDirectory(directoryImport).isEmpty()) { + if (! scannedPaths->contains(directoryImport)) { + *importedFiles += qmlFilesInDirectory(directoryImport); + scannedPaths->insert(directoryImport); } } } -- cgit v1.2.1