diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2010-09-27 12:47:21 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-29 03:38:30 (GMT) |
| commit | ee550b73ca47eeee2b2d745eaa28c8d0069190e5 (patch) | |
| tree | 13b0fcbc77cf139e0aaac77734c86798db3cb87f | |
| parent | e8d9e657509be4d8fea62a73c8dd51305951f1c9 (diff) | |
| download | Qt-ee550b73ca47eeee2b2d745eaa28c8d0069190e5.zip Qt-ee550b73ca47eeee2b2d745eaa28c8d0069190e5.tar.gz Qt-ee550b73ca47eeee2b2d745eaa28c8d0069190e5.tar.bz2 | |
Fix assert when placing a .qml file inside $QTDIR/imports
The assert "Internal error: Plugin imported previously with different uri"
happens on Windows. $QTDIR\imports, which is prefixed to the
search path, is still written with backslashes. Unify this to forward
slashes for all paths.
Task-number:QTBUG-13994
Reviewed-by: mae
(cherry picked from commit 0aa6360b7648ddeb8a905960265eb46d8c12448f)
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 8f95e26..fe4ed48 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -876,6 +876,7 @@ void QDeclarativeImportDatabase::addImportPath(const QString& path) cPath = dir.canonicalPath(); } else { cPath = path; + cPath.replace(QLatin1Char('\\'), QLatin1Char('/')); } if (!cPath.isEmpty() |