Native style: fix up qmldir files to comform to the new registration system

Change-Id: Id28352b397e3fc48423856a7f9322f3475d642ef
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

4 files changed, 56 insertions, 31 deletions

diff --git a/src/imports/controls/macos/CMakeLists.txt b/src/imports/controls/macos/CMakeLists.txt
index 5a5f8c37..59a1a1f7 100644
--- a/src/imports/controls/macos/CMakeLists.txt
+++ b/src/imports/controls/macos/CMakeLists.txt
@@ -8,9 +8,8 @@ qt_add_qml_module(qtquickcontrols2macosstyleplugin
     URI "QtQuick.Controls.macOS"
     VERSION "6.0" # special case
     CLASSNAME QtQuickControls2MacOSStylePlugin
-    DEPENDENCIES
-        QtQuick.Controls/2.5
-    SKIP_TYPE_REGISTRATION
+    IMPORTS
+        QtQuick.Controls.Fusion/auto
     GENERATE_QMLTYPES
     SOURCES
         qtquickcontrols2macosstyleplugin.cpp
@@ -56,43 +55,43 @@ set(qml_files
     "Dial.qml"
 )
 set_source_files_properties(Button.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(Slider.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(GroupBox.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(CheckBox.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(RadioButton.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(SpinBox.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(TextField.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(Frame.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(TextArea.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(ComboBox.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(ScrollBar.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(ProgressBar.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(Dial.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 
 qt6_target_qml_files(qtquickcontrols2macosstyleplugin
diff --git a/src/imports/controls/macos/qmldir b/src/imports/controls/macos/qmldir
index acc73818..ea71d8fc 100644
--- a/src/imports/controls/macos/qmldir
+++ b/src/imports/controls/macos/qmldir
@@ -1,4 +1,18 @@
 module QtQuick.Controls.macOS
 plugin qtquickcontrols2macosstyleplugin
 classname QtQuickControls2MacOSStylePlugin
-depends QtQuick.Controls 2.5
+import QtQuick.Controls.Fusion auto
+
+Button 6.0 Button.qml
+CheckBox 6.0 CheckBox.qml
+RadioButton 6.0 RadioButton.qml
+Slider 6.0 Slider.qml
+GroupBox 6.0 GroupBox.qml
+SpinBox 6.0 SpinBox.qml
+TextField 6.0 TextField.qml
+Frame 6.0 Frame.qml
+TextArea 6.0 TextArea.qml
+ComboBox 6.0 ComboBox.qml
+ScrollBar 6.0 ScrollBar.qml
+ProgressBar 6.0 ProgressBar.qml
+Dial 6.0 Dial.qml
diff --git a/src/imports/controls/windows/CMakeLists.txt b/src/imports/controls/windows/CMakeLists.txt
index 6a6606e4..749d19a2 100644
--- a/src/imports/controls/windows/CMakeLists.txt
+++ b/src/imports/controls/windows/CMakeLists.txt
@@ -8,9 +8,8 @@ qt_add_qml_module(qtquickcontrols2windowsstyleplugin
     URI "QtQuick.Controls.Windows"
     VERSION "6.0" # special case
     CLASSNAME QtQuickControls2WindowsStylePlugin
-    DEPENDENCIES
-        QtQuick.Controls/2.5
-    SKIP_TYPE_REGISTRATION
+    IMPORTS
+        QtQuick.Controls.Fusion/auto
     GENERATE_QMLTYPES
     SOURCES
         qtquickcontrols2windowsstyleplugin.cpp
@@ -53,34 +52,34 @@ set(qml_files
     "TextField.qml"
 )
 set_source_files_properties(Button.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(CheckBox.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(ComboBox.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(Frame.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(GroupBox.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(RadioButton.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(Slider.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(SpinBox.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(TextArea.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 set_source_files_properties(TextField.qml PROPERTIES
-    QT_QML_SKIP_QMLDIR_ENTRY TRUE
+    QT_QML_SOURCE_VERSION "6.0"
 )
 
 qt6_target_qml_files(qtquickcontrols2windowsstyleplugin
diff --git a/src/imports/controls/windows/qmldir b/src/imports/controls/windows/qmldir
index 92601cb6..ae893d7e 100644
--- a/src/imports/controls/windows/qmldir
+++ b/src/imports/controls/windows/qmldir
@@ -1,4 +1,17 @@
 module QtQuick.Controls.Windows
 plugin qtquickcontrols2windowsstyleplugin
 classname QtQuickControls2WindowsStylePlugin
-depends QtQuick.Controls 2.5
+import QtQuick.Controls.Fusion auto
+
+Button 6.0 Button.qml
+CheckBox 6.0 CheckBox.qml
+RadioButton 6.0 RadioButton.qml
+Slider 6.0 Slider.qml
+GroupBox 6.0 GroupBox.qml
+SpinBox 6.0 SpinBox.qml
+TextField 6.0 TextField.qml
+Frame 6.0 Frame.qml
+TextArea 6.0 TextArea.qml
+ComboBox 6.0 ComboBox.qml
+ScrollBar 6.0 ScrollBar.qml
+Dial 6.0 Dial.qml