From 96129accb536d530e9ce254139fe481cdcd9fd68 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Date: Tue, 31 May 2011 10:48:41 +0200
Subject: [PATCH] Qml Editor: accept imports with absolute paths

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>
---
 src/libs/qmljs/qmljsbind.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp
index e8005092ab7..93580d6fda9 100644
--- a/src/libs/qmljs/qmljsbind.cpp
+++ b/src/libs/qmljs/qmljsbind.cpp
@@ -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;