diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 2 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsinterpreter.cpp | 4 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsinterpreter.h | 2 | ||||
-rw-r--r-- | src/libs/qmljs/qmljslink.cpp | 2 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsplugindumper.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 18eef295ec..3584c9a851 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -123,7 +123,7 @@ public: QString fileName = url.toLocalFile(); if (!fileName.isEmpty()) { if (QFileInfo(fileName).isRelative()) { - fileName.prepend(QDir::separator()); + fileName.prepend(QLatin1Char('/')); fileName.prepend(_doc->path()); } if (!QFileInfo(fileName).exists()) diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index b4165cdba0..1be8980ecc 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -2185,7 +2185,7 @@ ImportInfo ImportInfo::moduleImport(QString uri, ComponentVersion version, info.m_type = ImportType::Library; info.m_name = uri; info.m_path = uri; - info.m_path.replace(QLatin1Char('.'), QDir::separator()); + info.m_path.replace(QLatin1Char('.'), QLatin1Char('/')); info.m_version = version; info.m_as = as; info.m_ast = ast; @@ -2200,7 +2200,7 @@ ImportInfo ImportInfo::pathImport(const QString &docPath, const QString &path, QFileInfo importFileInfo(path); if (!importFileInfo.isAbsolute()) - importFileInfo = QFileInfo(docPath + QDir::separator() + path); + importFileInfo = QFileInfo(docPath + QLatin1Char('/') + path); info.m_path = importFileInfo.absoluteFilePath(); if (importFileInfo.isFile()) { diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index 01bb184d5b..c992f07713 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -961,7 +961,7 @@ public: // Other: non-absolute path QString name() const; - // LibraryImport: uri with QDir::separator separator + // LibraryImport: uri with '/' separator // Other: absoluteFilePath QString path() const; diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index e0006e4b83..50746e0a76 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -551,7 +551,7 @@ void LinkPrivate::loadQmldirComponents(ObjectValue *import, ComponentVersion ver importedTypes.insert(component.typeName); if (Document::Ptr importedDoc = snapshot.document( - libraryPath + QDir::separator() + component.fileName)) { + libraryPath + QLatin1Char('/') + component.fileName)) { if (ObjectValue *v = importedDoc->bind()->rootObjectValue()) import->setMember(component.typeName, v); } diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index 18fb1666ed..3b73cd86d4 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -138,7 +138,7 @@ static QString makeAbsolute(const QString &path, const QString &base) { if (QFileInfo(path).isAbsolute()) return path; - return QString::fromLatin1("%1%2%3").arg(base, QDir::separator(), path); + return QString::fromLatin1("%1/%3").arg(base, path); } void PluginDumper::onLoadPluginTypes(const QString &libraryPath, const QString &importPath, const QString &importUri, const QString &importVersion) |