diff --git a/src/libs/qmljs/parser/qmlimportresolver.cpp b/src/libs/qmljs/parser/qmlimportresolver.cpp index e74c5840c1c..a682f56ac30 100644 --- a/src/libs/qmljs/parser/qmlimportresolver.cpp +++ b/src/libs/qmljs/parser/qmlimportresolver.cpp @@ -25,6 +25,8 @@ #include "qmlimportresolver_p.h" +#include + QT_QML_BEGIN_NAMESPACE enum ImportVersion { FullyVersioned, PartiallyVersioned, Unversioned }; @@ -46,7 +48,14 @@ QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths static const QLatin1Char Slash('/'); static const QLatin1Char Backslash('\\'); - const QList parts = uri.split(u'.', Qt::SkipEmptyParts); + const QList parts +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2) + = uri.split(u'.', Qt::SkipEmptyParts); +#else + = Utils::transform(uri.toString().split('.', Qt::SkipEmptyParts), [](const QString &s) { + return QStringView(s); + }); +#endif QStringList importPaths; // fully & partially versioned parts + 1 unversioned for each base path @@ -72,7 +81,7 @@ QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths for (auto it = refs.cbegin(); it != refs.cend(); ++it) { if (it != refs.cbegin()) str += sep; - str += *it; + str += (*it).toString(); } return str; }; diff --git a/src/libs/qmljs/parser/qmljsast.cpp b/src/libs/qmljs/parser/qmljsast.cpp index fd99d9e4d59..19db1058a23 100644 --- a/src/libs/qmljs/parser/qmljsast.cpp +++ b/src/libs/qmljs/parser/qmljsast.cpp @@ -1582,7 +1582,7 @@ QString Type::toString() const void Type::toString(QString *out) const { for (QmlJS::AST::UiQualifiedId *it = typeId; it; it = it->next) { - out->append(it->name); + out->append(it->name.toString()); if (it->next) out->append(QLatin1Char('.'));