diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-06 15:00:52 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-07 19:50:08 +0100 |
| commit | 13f7961fac555666e035bbcc447fbaf67804cbcb (patch) | |
| tree | c3a7f174110531991fd3082203f9a1db2d61ce36 | |
| parent | e1af84ab258d97ef94a10645dcd6d2fdecf06059 (diff) | |
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>
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 5dad4badf4..cb634c995b 100644 --- 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; |