Use document imports of QtQuick.Controls.impl, not qmldir-imports

qmldir-imports are transitive, meaning that we were exposing all types
from QtQuick.Controls.impl each time QtQuick.Controls was imported.

This patch removes these transitive qmldir-imports by moving the
foreign type declarations for QQuickOverlay and
QQuickSplitHandleAttached into the Basic style (which is always
imported by every style as a final fallback).

Task-number: QTBUG-104768
Task-number: QTBUG-123103
Change-Id: Ia0ff778a88a38bb872730e055631dc924456d7be
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>

7 files changed, 11 insertions, 10 deletions

diff --git a/src/quickcontrols/basic/CMakeLists.txt b/src/quickcontrols/basic/CMakeLists.txt
index 12404f0851..a9ed8f1f2a 100644
--- a/src/quickcontrols/basic/CMakeLists.txt
+++ b/src/quickcontrols/basic/CMakeLists.txt
@@ -157,14 +157,13 @@ qt_internal_add_qml_module(QuickControls2Basic
     CLASS_NAME QtQuickControls2BasicStylePlugin
     DEPENDENCIES
         QtQuick/auto
-    IMPORTS
-        QtQuick.Controls.impl/auto
     PLUGIN_TARGET qtquickcontrols2basicstyleplugin
     NO_PLUGIN_OPTIONAL
     NO_GENERATE_PLUGIN_SOURCE
     SOURCES
         qquickbasicstyle.cpp qquickbasicstyle_p.h
         qquickbasictheme.cpp qquickbasictheme_p.h
+        qtquickcontrols2basicforeign.cpp qtquickcontrols2basicforeign_p.h
     QML_FILES
         ${qml_files}
     DEFINES
diff --git a/src/quickcontrolsimpl/qtquickcontrols2foreign.cpp b/src/quickcontrols/basic/qtquickcontrols2basicforeign.cpp
index e55cd304c3..7a5472e758 100644
--- a/src/quickcontrolsimpl/qtquickcontrols2foreign.cpp
+++ b/src/quickcontrols/basic/qtquickcontrols2basicforeign.cpp
@@ -1,10 +1,10 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#include "qtquickcontrols2foreign_p.h"
+#include "qtquickcontrols2basicforeign_p.h"
 
 QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-#include "moc_qtquickcontrols2foreign_p.cpp"
+#include "moc_qtquickcontrols2basicforeign_p.cpp"
diff --git a/src/quickcontrolsimpl/qtquickcontrols2foreign_p.h b/src/quickcontrols/basic/qtquickcontrols2basicforeign_p.h
index 8bb0e2e084..203a1c69a3 100644
--- a/src/quickcontrolsimpl/qtquickcontrols2foreign_p.h
+++ b/src/quickcontrols/basic/qtquickcontrols2basicforeign_p.h
@@ -1,7 +1,7 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#ifndef QTQUICKCONTROLS2FOREIGN_P_H
-#define QTQUICKCONTROLS2FOREIGN_P_H
+#ifndef QTQUICKCONTROLS2BASICFOREIGN_P_H
+#define QTQUICKCONTROLS2BASICFOREIGN_P_H
 
 #include <QtQml/qqml.h>
 #include <QtQuickTemplates2/private/qquickoverlay_p.h>
@@ -48,4 +48,4 @@ struct QQuickSplitHandleAttachedForeign
 
 QT_END_NAMESPACE
 
-#endif // QTQUICKCONTROLS2FOREIGN_P_H
+#endif // QTQUICKCONTROLS2BASICFOREIGN_P_H
diff --git a/src/quickcontrols/ios/DialogButtonBox.qml b/src/quickcontrols/ios/DialogButtonBox.qml
index 4dd5fec2a5..f04088a9d1 100644
--- a/src/quickcontrols/ios/DialogButtonBox.qml
+++ b/src/quickcontrols/ios/DialogButtonBox.qml
@@ -3,6 +3,7 @@
 
 import QtQuick
 import QtQuick.Templates as T
+import QtQuick.Controls.impl
 import QtQuick.Controls.iOS.impl
 
 T.DialogButtonBox {
diff --git a/src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml b/src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml
index ec506f6c06..2be1f9535e 100644
--- a/src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml
+++ b/src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml
@@ -3,6 +3,7 @@
 
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.impl
 import QtQuick.Controls.iOS.impl
 
 Button {
diff --git a/src/quickcontrols/material/Drawer.qml b/src/quickcontrols/material/Drawer.qml
index 915c98bb5a..fc31a19a84 100644
--- a/src/quickcontrols/material/Drawer.qml
+++ b/src/quickcontrols/material/Drawer.qml
@@ -3,6 +3,7 @@
 
 import QtQuick
 import QtQuick.Templates as T
+import QtQuick.Controls.impl
 import QtQuick.Controls.Material
 import QtQuick.Controls.Material.impl
 
diff --git a/src/quickcontrolsimpl/CMakeLists.txt b/src/quickcontrolsimpl/CMakeLists.txt
index 6bc7d566fc..5b8d932384 100644
--- a/src/quickcontrolsimpl/CMakeLists.txt
+++ b/src/quickcontrolsimpl/CMakeLists.txt
@@ -30,7 +30,6 @@ qt_internal_add_qml_module(QuickControls2Impl
         qquickpaddedrectangle.cpp qquickpaddedrectangle_p.h
         qquickplaceholdertext.cpp qquickplaceholdertext_p.h
         qquickplatformtheme.cpp qquickplatformtheme_p.h
-        qtquickcontrols2foreign.cpp qtquickcontrols2foreign_p.h
         qtquickcontrols2implglobal_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII