aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmltypeloader_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-07-12 20:47:41 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-07-17 13:09:50 +0200
commit140634d2029bfcffd77b16175906082bd03d2d0c (patch)
tree1803d693e778dfcd50b10720a2f57b2bbb3da71a /src/qml/qml/qqmltypeloader_p.h
parentd2c6ac8d5eaa1d4b53b647f01c53d821bbba4665 (diff)
Add support for implicit module imports
This allows a module to make another module import with the same minor version and in the same qualified namespace. This will be used to make import QtQuick 2.5 implicitly import QtQml 2.5, to maintain compatibility. It used to be implemented by means of calling C++ type registration functions directly. Change-Id: I64c7bfe25d75b9a45f5d44a10d035fc2f86d30ca Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypeloader_p.h')
-rw-r--r--src/qml/qml/qqmltypeloader_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index f8cec700a5..612d6777ed 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -122,6 +122,8 @@ public:
void dependencyComplete(QQmlDataBlob *) override;
+ bool loadImportDependencies(PendingImportPtr currentImport, const QString &qmldirUri, QList<QQmlError> *errors);
+
protected:
virtual QString stringAt(int) const { return QString(); }