diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-17 15:42:05 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-24 18:26:14 +0200 |
| commit | 36df81b3bc6d721d5598d5163b0a9659de4a69ee (patch) | |
| tree | d9032e08f4d27daa9e4b16a2c2e622ed2fa6951b /src/imports/qtquick2 | |
| parent | 6de0287d7c3aa4251fe6eb4f970d73ce11cf07fc (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/imports/qtquick2')
| -rw-r--r-- | src/imports/qtquick2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/imports/qtquick2/qmldir | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index e007c476f8..1da9bad480 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -11,7 +11,7 @@ qt_add_qml_module(qtquick2plugin CLASSNAME QtQuick2Plugin SKIP_TYPE_REGISTRATION IMPORTS - QtQml + QtQml/auto SOURCES plugin.cpp PUBLIC_LIBRARIES diff --git a/src/imports/qtquick2/qmldir b/src/imports/qtquick2/qmldir index d74aabd9e9..b5c754a36f 100644 --- a/src/imports/qtquick2/qmldir +++ b/src/imports/qtquick2/qmldir @@ -3,4 +3,4 @@ plugin qtquick2plugin classname QtQuick2Plugin typeinfo plugins.qmltypes designersupported -import QtQml +import QtQml auto |