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

Qml Editor: accept imports with absolute paths

Browse Source 
qmljs code model now correctly handles absolute paths in imports

Change-Id: I6a4bcfbe9a8d9ab70b5fcac1df36ba9802ff5efe
Reviewed-on: http://codereview.qt.nokia.com/256
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Fawzi Mohamed
2011-05-31 10:48:41 +02:00
parent 31ac8bd293
commit 96129accb5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/qmljs/qmljsbind.cpp
View File

@@ -269,7 +269,10 @@ bool Bind::visit(UiImport *ast)
errorMessage(ast, tr("package import requires a version number")));
}
} else if (ast->fileName) {
const QFileInfo importFileInfo(_doc->path() + QDir::separator() + ast->fileName->asString());
QFileInfo importFileInfo(ast->fileName->asString());
if (!importFileInfo.isAbsolute()) {
importFileInfo=QFileInfo(_doc->path() + QDir::separator() + ast->fileName->asString());
}
name = importFileInfo.absoluteFilePath();
if (importFileInfo.isFile())
type = ImportInfo::FileImport;