Fix importing of files on Windows.

Do not create local file Urls by adding 'file://' + path, use
QUrl's logic to correctly add missing slashes for Windows drive
letters.

Change-Id: I1a8a58a0d88ef291bb814303747ce53093be17a2
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index 5dad4ba..cb634c9 100644 (file)
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -528,7 +528,7 @@ bool QDeclarativeImportsPrivate::add(const QDeclarativeDirComponents &qmldircomp
                     if (absolutePath.at(0) == QLatin1Char(':'))
                         url = QLatin1String("qrc://") + absolutePath.mid(1);
                     else
-                        url = QLatin1String("file://") + absolutePath;
+                        url = QUrl::fromLocalFile(absolutePath).toString();
                     uri = resolvedUri(dir, database);
                     if (!importExtension(absoluteFilePath, uri, database, &qmldircomponents, errors))
                         return false;