diff options
| author | Ulf Hermann <[email protected]> | 2022-12-20 08:21:57 +0100 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2022-12-22 03:57:04 +0100 |
| commit | 4cbc25f37908be48af9c5e2024069c9bb2f88a16 (patch) | |
| tree | 6686f58a91ed279dbc33db6ba52382a8f08b3c6f /src | |
| parent | 0cd146b4b015d2ba79f258b27f3109b3e21e855a (diff) | |
Controls: Move QtQuick.Controls.impl import to QtQuick.Controls.Basic
We want it to be available in all the individual styles, not only if you
import QtQuick.Controls.
Fixes: QTBUG-104768
Fixes: QTBUG-109299
Pick-to: 6.5
Change-Id: Id483ee9f721e0c820bed638702a4a8aced759063
Reviewed-by: Ulf Hermann <[email protected]>
Reviewed-by: Mitch Curtis <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quickcontrols/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quickcontrols/basic/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quickcontrols/CMakeLists.txt b/src/quickcontrols/CMakeLists.txt index 24a2ca8ca2..e5d8e68e39 100644 --- a/src/quickcontrols/CMakeLists.txt +++ b/src/quickcontrols/CMakeLists.txt @@ -12,8 +12,6 @@ qt_internal_add_qml_module(QuickControls2 DESIGNER_SUPPORTED CLASS_NAME QtQuickControls2Plugin PLUGIN_TARGET qtquickcontrols2plugin - IMPORTS - QtQuick.Controls.impl/auto OPTIONAL_IMPORTS QtQuick.Controls.Fusion/auto QtQuick.Controls.Material/auto diff --git a/src/quickcontrols/basic/CMakeLists.txt b/src/quickcontrols/basic/CMakeLists.txt index e45b6d09c0..4bc75288af 100644 --- a/src/quickcontrols/basic/CMakeLists.txt +++ b/src/quickcontrols/basic/CMakeLists.txt @@ -155,6 +155,8 @@ qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin CLASS_NAME QtQuickControls2BasicStylePlugin DEPENDENCIES QtQuick/auto + IMPORTS + QtQuick.Controls.impl/auto PLUGIN_TARGET qtquickcontrols2basicstyleplugin NO_PLUGIN_OPTIONAL NO_GENERATE_PLUGIN_SOURCE |