diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-07 09:44:25 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-12 21:42:21 +0200 |
| commit | 4da42d87707779509f44fe4893636f20ec913f79 (patch) | |
| tree | dc357a6262e21bb7aa463740a0292902c789caa9 | |
| parent | 03d1d470e85ee19cb38d47e9aae9588e68622781 (diff) | |
Add optional imports for all the styles to controls/qmldir
This allows qmllint to find them.
Change-Id: I33b8ad4b2a736d914e7522761c2e574e482b9460
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/.prev_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/imports/controls/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/imports/controls/qmldir | 7 |
3 files changed, 23 insertions, 0 deletions
diff --git a/src/imports/controls/.prev_CMakeLists.txt b/src/imports/controls/.prev_CMakeLists.txt index 78dfae8d..f36a608f 100644 --- a/src/imports/controls/.prev_CMakeLists.txt +++ b/src/imports/controls/.prev_CMakeLists.txt @@ -12,6 +12,14 @@ qt_internal_add_qml_module(qtquickcontrols2plugin SKIP_TYPE_REGISTRATION IMPORTS QtQuick.Controls.impl/auto + OPTIONAL_IMPORTS + QtQuick.Controls.Basic/auto + QtQuick.Controls.Fusion/auto + QtQuick.Controls.Material/auto + QtQuick.Controls.Imagine/auto + QtQuick.Controls.Universal/auto + QtQuick.Controls.Windows/auto + QtQuick.Controls.macOS/auto SOURCES qtquickcontrols2plugin.cpp DEFINES diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt index c71d73b6..2587124f 100644 --- a/src/imports/controls/CMakeLists.txt +++ b/src/imports/controls/CMakeLists.txt @@ -12,6 +12,14 @@ qt_internal_add_qml_module(qtquickcontrols2plugin SKIP_TYPE_REGISTRATION IMPORTS QtQuick.Controls.impl/auto + OPTIONAL_IMPORTS + QtQuick.Controls.Basic/auto + QtQuick.Controls.Fusion/auto + QtQuick.Controls.Material/auto + QtQuick.Controls.Imagine/auto + QtQuick.Controls.Universal/auto + QtQuick.Controls.Windows/auto + QtQuick.Controls.macOS/auto SOURCES qtquickcontrols2plugin.cpp DEFINES diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir index b7a6473b..d0000341 100644 --- a/src/imports/controls/qmldir +++ b/src/imports/controls/qmldir @@ -2,4 +2,11 @@ module QtQuick.Controls plugin qtquickcontrols2plugin classname QtQuickControls2Plugin import QtQuick.Controls.impl auto +optional import QtQuick.Controls.Basic auto +optional import QtQuick.Controls.Fusion auto +optional import QtQuick.Controls.Material auto +optional import QtQuick.Controls.Imagine auto +optional import QtQuick.Controls.Universal auto +optional import QtQuick.Controls.Windows auto +optional import QtQuick.Controls.macOS auto designersupported |