diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-13 10:56:26 +0100 |
|---|---|---|
| committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2020-02-18 17:30:42 +0200 |
| commit | cbd4456c9db70afda6c8408be7e5da800889d169 (patch) | |
| tree | c09bedfa3378dbe6582c9522e6bb2d9f0ec5d715 | |
| parent | 0a155d14578d01bfe02fa9383745e04bfa1e5648 (diff) | |
Fix warning about non-relative paths in qmldir files
Permit the use of resource urls in qmldir files to allow for the
use-case of a plugin including its .qml files in resources and
optionally compiling them ahead of time. When the resources are bundled
in the plugin, qmlplugindump might or might not work.
Task-number: QTBUG-48809
Change-Id: Icb331c7575f26316b5c2bcc604b9c6d793977a9f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit f15c2c22cb677677ccf8aacb2603fcf774d13584)
| -rw-r--r-- | src/qml/qml/qqmldirparser_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmldirparser_p.h b/src/qml/qml/qqmldirparser_p.h index bfb75d0509..637852091f 100644 --- a/src/qml/qml/qqmldirparser_p.h +++ b/src/qml/qml/qqmldirparser_p.h @@ -78,7 +78,7 @@ public: static void checkNonRelative(const char *item, const QString &typeName, const QString &fileName) { - if (fileName.startsWith(QLatin1Char('/')) || fileName.contains(QLatin1Char(':'))) { + if (fileName.startsWith(QLatin1Char('/'))) { qWarning() << item << typeName << "is specified with non-relative URL" << fileName << "in a qmldir file." << "URLs in qmldir files should be relative to the qmldir file's directory."; |