From dbca762f45d3249974652cccb5d6421440f852ae Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 28 Jun 2021 11:04:40 +0200 Subject: QtQml: Move locateLocalQmldir and make it a template It conceptually belongs into QQmlImportDatabase because it messes with the qmldir cache. This way, if we reject a qmldir file for whatever reason, we can still check for further matching qmldir files in other places. We might, for example determine that we need to load a plugin, but we have been given a qmldir file in the resource file system. In that case, we want to check for other instances of the same module in the host file system. Pick-to: 6.2 Change-Id: I8fe4a0f188f3732b9d10d017a94562e8bd1fb242 Reviewed-by: Fabian Kosmale --- src/qml/qml/qqmlengine.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/qml/qml/qqmlengine.h') diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index 37ca25779f..64e4a82b03 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -136,6 +136,7 @@ public: void addUrlInterceptor(QQmlAbstractUrlInterceptor *urlInterceptor); void removeUrlInterceptor(QQmlAbstractUrlInterceptor *urlInterceptor); + QList urlInterceptors() const; QUrl interceptUrl(const QUrl &url, QQmlAbstractUrlInterceptor::DataType type) const; void addImageProvider(const QString &id, QQmlImageProviderBase *); -- cgit v1.2.3