diff --git a/src/3rdparty/webkit/WebCore/page/FocusController.cpp b/src/3rdparty/webkit/WebCore/page/FocusController.cpp diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 94765f2..afe60d3 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -909,13 +909,8 @@ void QDeclarativeImportDatabase::addImportPath(const QString& path) QUrl url = QUrl(path); QString cPath; - if (url.isRelative() || url.scheme() == QLatin1String("file")) { - QDir dir = QDir(path); - cPath = dir.canonicalPath(); - } else { - cPath = path; - cPath.replace(QLatin1Char('\\'), QLatin1Char('/')); - } + QDir dir = QDir(path); + cPath = dir.canonicalPath(); if (!cPath.isEmpty() && !fileImportPath.contains(cPath))