diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-07-02 13:49:54 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-07-09 16:32:51 +0200 |
| commit | a99fa4cb4ca1f834235a819bb823b135d0d0203a (patch) | |
| tree | 13f165dfacec129630866a89622acfd8a54c68b9 | |
| parent | 21c76b94d0c630f9c99015523bd4628c36e5264b (diff) | |
List QtQml, QtQml.Models, and QtQml.WorkerScript as dependencies
This does not express the full scope of what is happening, but it might
help tools figure out that the respective types will be available when
QtQuick or QtQml are loaded.
Task-number: QTBUG-84286
Change-Id: I60522e76fc15db0cccf900d7d2a10c50519ba877
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/imports/qtqml/qmldir | 2 | ||||
| -rw-r--r-- | src/imports/qtquick2/qmldir | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes | 7 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/imports/qtqml/qmldir b/src/imports/qtqml/qmldir index f6b51c7970..98555ee1c7 100644 --- a/src/imports/qtqml/qmldir +++ b/src/imports/qtqml/qmldir @@ -1,4 +1,6 @@ module QtQml plugin qmlplugin classname QtQmlPlugin +depends QtQml.Models 2.15 +depends QtQml.WorkerScript 2.15 typeinfo plugins.qmltypes diff --git a/src/imports/qtquick2/qmldir b/src/imports/qtquick2/qmldir index 8167e813df..e4e7f5d00b 100644 --- a/src/imports/qtquick2/qmldir +++ b/src/imports/qtquick2/qmldir @@ -2,4 +2,5 @@ module QtQuick plugin qtquick2plugin classname QtQuick2Plugin typeinfo plugins.qmltypes +depends QtQml 2.15 designersupported diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes b/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes index fb13928ba0..02b8117c28 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes @@ -7,7 +7,12 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable -noforceqtquick dumper.Imports 1.0 .' Module { - dependencies: ["QtQuick 2.0"] + dependencies: [ + "QtQml 2.15", + "QtQml.Models 2.15", + "QtQml.WorkerScript 2.15", + "QtQuick 2.0" + ] Component { name: "Imports" prototype: "QObject" |