diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-18 06:12:32 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-18 06:12:32 (GMT) |
| commit | b338db7f6091629dcfa4cbde3ea58a76e6fa6733 (patch) | |
| tree | 37fac25ba6dfeafb84a6ee41aaed07daee2cb663 | |
| parent | 261f8eecfe0580c198d8d4f71f2afa59abd080e0 (diff) | |
| download | Qt-b338db7f6091629dcfa4cbde3ea58a76e6fa6733.zip Qt-b338db7f6091629dcfa4cbde3ea58a76e6fa6733.tar.gz Qt-b338db7f6091629dcfa4cbde3ea58a76e6fa6733.tar.bz2 | |
Use the correct base URL in resolveUri
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 5 |
1 files 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; } |