diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-27 22:00:20 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-27 22:00:20 (GMT) |
| commit | 588105a6046c1b7ca81471846c8876d35c87a486 (patch) | |
| tree | ef6f242fba71e9719ebd1f2c91211440c8d5820d /src/declarative/qml/qdeclarativeimport.cpp | |
| parent | 014797f54e24172d424f88e8e2e53f16759d6bb5 (diff) | |
| parent | 7b796b4dcdebfba55c4754d241edb334217fc550 (diff) | |
| download | Qt-588105a6046c1b7ca81471846c8876d35c87a486.zip Qt-588105a6046c1b7ca81471846c8876d35c87a486.tar.gz Qt-588105a6046c1b7ca81471846c8876d35c87a486.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative/qml/qdeclarativeimport.cpp')
| -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() |