aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlmetatype_p.h
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-06-17 15:42:05 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-06-24 18:26:14 +0200
commit36df81b3bc6d721d5598d5163b0a9659de4a69ee (patch)
treed9032e08f4d27daa9e4b16a2c2e622ed2fa6951b /src/qml/qml/qqmlmetatype_p.h
parent6de0287d7c3aa4251fe6eb4f970d73ce11cf07fc (diff)
Discern between "auto" and versioned imports in qmldirs
You can now import the latest version, a specific version, or, "auto" which is the same version as the parent module. [ChangeLog][QtQml] You can now procedurally add module imports to modules, using qmlRegisterModuleImport(). However, actual import statements in qmldir files should be preferred wherever possible. Fixes: QTBUG-84899 Change-Id: I3b32dd8b07a19d31b6538b9a6bb436840862f345 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
-rw-r--r--src/qml/qml/qqmlmetatype_p.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index 1c00d65b75..7b142dd07f 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -54,6 +54,7 @@
#include <private/qtqmlglobal_p.h>
#include <private/qqmltype_p.h>
#include <private/qqmlproxymetaobject_p.h>
+#include <private/qqmldirparser_p.h>
QT_BEGIN_NAMESPACE
@@ -98,8 +99,12 @@ public:
static void registerModule(const char *uri, QTypeRevision version);
static bool protectModule(const QString &uri, QTypeRevision version,
bool protectAllVersions = false);
- static void registerModuleImport(const QString &uri, QTypeRevision version, const QString &import);
- static void unregisterModuleImport(const QString &uri, QTypeRevision version, const QString &import);
+
+ static void registerModuleImport(const QString &uri, QTypeRevision version,
+ const QQmlDirParser::Import &import);
+ static void unregisterModuleImport(const QString &uri, QTypeRevision version,
+ const QQmlDirParser::Import &import);
+ static QList<QQmlDirParser::Import> moduleImports(const QString &uri, QTypeRevision version);
static int typeId(const char *uri, QTypeRevision version, const char *qmlName);