diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-27 14:56:37 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-03-28 06:35:06 +0000 |
| commit | aa51b3bf4ea854ffe7b39403289689daa428b221 (patch) | |
| tree | 76768cf4272632bcd13f87094a452aabfe95f51b | |
| parent | 28a114cbf7a3c2c18948e8bd582e5b5463443cab (diff) | |
Avoid redundant slashes when creating qmldir URLs
If the path starts with ":" and we assume it's an absolute qrc path, the
only thing we need to do to make it a URL is prepend "qrc".
Fixes: QTBUG-74677
Change-Id: Iee0239296b6f48ce909db02ae16e24dfc745b637
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index a31dbd1e08..a79d4d074c 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1331,7 +1331,7 @@ bool QQmlImportsPrivate::locateQmldir(const QString &uri, int vmaj, int vmin, QQ QString url; const QStringRef absolutePath = absoluteFilePath.leftRef(absoluteFilePath.lastIndexOf(Slash) + 1); if (absolutePath.at(0) == Colon) - url = QLatin1String("qrc://") + absolutePath.mid(1); + url = QLatin1String("qrc") + absolutePath; else url = QUrl::fromLocalFile(absolutePath.toString()).toString(); |