diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2010-09-27 12:47:21 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2010-09-27 12:58:49 (GMT) |
| commit | 0aa6360b7648ddeb8a905960265eb46d8c12448f (patch) | |
| tree | e7124e904885c45ae27fcca5b1e039be732ad683 /src | |
| parent | ae5eae1a859f330922b1480f82498c5a6212ebd0 (diff) | |
| download | Qt-0aa6360b7648ddeb8a905960265eb46d8c12448f.zip Qt-0aa6360b7648ddeb8a905960265eb46d8c12448f.tar.gz Qt-0aa6360b7648ddeb8a905960265eb46d8c12448f.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
Diffstat (limited to 'src')
| -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() |