From b338db7f6091629dcfa4cbde3ea58a76e6fa6733 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 18 Mar 2010 16:12:32 +1000
Subject: Use the correct base URL in resolveUri

---
 src/declarative/qml/qdeclarativeengine.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index a097b02..800434a 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1476,9 +1476,8 @@ public:
 
         QStringList paths;
 
-        QUrl baseUrl = QDeclarativeEnginePrivate::get(engine)->baseUrl;
-        if (!baseUrl.isEmpty()) {
-            QString baseDir = QFileInfo(toLocalFileOrQrc(baseUrl)).path();
+        if (!base.isEmpty()) {
+            QString baseDir = QFileInfo(toLocalFileOrQrc(base)).path();
             paths += baseDir;
         }
 
-- 
cgit v0.12