feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Set importing scopes for scripts correctly.

Browse Source 
They had not yet been updated to the new way of importing javascript.

Reviewed-by: Erik Verbruggen
This commit is contained in:
Christian Kamm
2010-04-22 16:32:28 +02:00
parent 3286f48504
commit 3096b2a06f
4 changed files with 30 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qmljseditor/qmljsmodelmanager.cpp
View File

@@ -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);
}
}
}