Dialogs: Use generic QtQuick.Controls import in base fallback dialogs6.11

Commit f2920663dcd3 ("Dialogs: Only import the QQC2 module used by the
style") changed the base fallback dialog QML files to import
QtQuick.Controls.Basic instead of QtQuick.Controls. This hardcodes the
Basic style for the fallback, preventing the active style from being
picked up at runtime. Only the style-specific files (+Fusion/, +Material/, etc.) should hardcode their style module.

Revert the base fallback imports to use the generic QtQuick.Controls
module so the active style is applied correctly.

Fixes: QTBUG-133655
Pick-to: 6.8
Change-Id: Ia4b98e13858c411d0b78bdc16027093bf685ce2e
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
(cherry picked from commit 9ebd2fbd7ea08333257f8566c3994870451f0888)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

7 files changed, 7 insertions, 12 deletions

diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/ColorDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/ColorDialog.qml
index c311898598..d2798a7409 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/ColorDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/ColorDialog.qml
@@ -3,9 +3,8 @@
 // Qt-Security score:significant reason:default
 
 import QtQuick
+import QtQuick.Controls
 import QtQuick.Controls.impl
-import QtQuick.Controls.Basic
-import QtQuick.Controls.Basic.impl
 import QtQuick.Dialogs
 import QtQuick.Dialogs.quickimpl
 import QtQuick.Layouts
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/ColorInputs.qml b/src/quickdialogs/quickdialogsquickimpl/qml/ColorInputs.qml
index 7307ac2375..16a6fc1ea3 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/ColorInputs.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/ColorInputs.qml
@@ -3,7 +3,7 @@
 // Qt-Security score:significant reason:default
 
 import QtQuick
-import QtQuick.Controls.Basic
+import QtQuick.Controls
 import QtQuick.Controls.impl
 import QtQuick.Layouts
 import QtQuick.Dialogs.quickimpl as DialogsQuickImpl
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/FileDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FileDialog.qml
index ccc06501f1..f7a4ace0f4 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/FileDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FileDialog.qml
@@ -4,9 +4,8 @@
 
 import Qt.labs.folderlistmodel
 import QtQuick
+import QtQuick.Controls
 import QtQuick.Controls.impl
-import QtQuick.Controls.Basic
-import QtQuick.Controls.Basic.impl
 import QtQuick.Dialogs
 import QtQuick.Dialogs.quickimpl
 import QtQuick.Layouts
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialog.qml
index 31280304f7..546d139c41 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialog.qml
@@ -4,9 +4,8 @@
 
 import Qt.labs.folderlistmodel
 import QtQuick
+import QtQuick.Controls
 import QtQuick.Controls.impl
-import QtQuick.Controls.Basic
-import QtQuick.Controls.Basic.impl
 import QtQuick.Dialogs
 import QtQuick.Dialogs.quickimpl
 import QtQuick.Layouts
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/FontDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FontDialog.qml
index 588fb6fb4c..eb4e48fcc3 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/FontDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FontDialog.qml
@@ -3,9 +3,8 @@
 // Qt-Security score:significant reason:default
 
 import QtQuick
+import QtQuick.Controls
 import QtQuick.Controls.impl
-import QtQuick.Controls.Basic
-import QtQuick.Controls.Basic.impl
 import QtQuick.Dialogs
 import QtQuick.Dialogs.quickimpl
 import QtQuick.Layouts
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml
index e88a2e4de8..2192dfdd72 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml
@@ -3,9 +3,8 @@
 // Qt-Security score:significant reason:default
 
 import QtQuick
+import QtQuick.Controls
 import QtQuick.Controls.impl
-import QtQuick.Controls.Basic
-import QtQuick.Controls.Basic.impl
 import QtQuick.Dialogs
 import QtQuick.Dialogs.quickimpl
 import QtQuick.Layouts
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/SideBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/SideBar.qml
index 1e612afbe2..06a370b24f 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/SideBar.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/SideBar.qml
@@ -3,7 +3,7 @@
 // Qt-Security score:significant reason:default
 
 import QtQuick
-import QtQuick.Controls.Basic
+import QtQuick.Controls
 import QtQuick.Controls.impl
 import QtQuick.Dialogs.quickimpl as DialogsQuickImpl