Use <major>.0 as default version for QML files

Using the full module versions presents problems if you bump the minor
version of your module. Bumping the minor version then bumps the
versions of all QML files not explicitly versioned. This is certainly
not what you want as the files should still be available to imports of
the old version.

Having it default to minor version 0 is more practical because many QML
files are available from version 0 of their respective modules. Now you
need to add version entries for files you add after .0 in order for them
not to show up in imports of earlier versions. This is less of a
problem, though, even if you forget it.

In addition, use PAST_MAJOR_VERSIONS to derive additional versions to be
added to the QML files. This allows us to drop a lot of boiler plate
code from our own modules.

Change-Id: I8e4cfc16180af30e8bafc0a62137e9018f7eaee8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit de27215766f13cb5c870e6a1285836164d6e574c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

14 files changed, 30 insertions, 630 deletions

diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index 985a6a3a06..3277322746 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -1230,7 +1230,9 @@ endif()
 # customize the file's type details:
 #
 # QT_QML_SOURCE_VERSION: Version(s) for this qml file. If not present the module
-#   version will be used.
+#   major version and minor version 0 will be used. If any PAST_MAJOR_VERSIONS
+#   are given, those will be amended with minor version 0 and also added to the
+#   default.
 #
 # QT_QML_SOURCE_TYPENAME: Override the file's type name. If not present, the
 #   type name will be deduced using the file's basename.
@@ -1243,7 +1245,7 @@ endif()
 #   e.g.:
 #       set_source_files_properties(my_qml_file.qml
 #           PROPERTIES
-#               QT_QML_SOURCE_VERSION "2.0;6.0"
+#               QT_QML_SOURCE_VERSION "2.3;6.0"
 #               QT_QML_SOURCE_TYPENAME MyQmlFile
 #
 #       qt6_target_qml_sources(my_qml_module
@@ -1251,9 +1253,10 @@ endif()
 #               my_qml_file.qml
 #       )
 #
-# The above will produce the following entry in the qmldir file:
+# The above will produce the following entries in the qmldir file:
 #
-#   MyQmlFile 2.0 my_qml_file.qml
+#   MyQmlFile 2.3 my_qml_file.qml
+#   MyQmlFile 6.0 my_qml_file.qml
 #
 function(qt6_target_qml_sources target)
 
@@ -1308,6 +1311,7 @@ function(qt6_target_qml_sources target)
     get_target_property(no_qmldir              ${target} QT_QML_MODULE_NO_GENERATE_QMLDIR)
     get_target_property(resource_prefix        ${target} QT_QML_MODULE_RESOURCE_PREFIX)
     get_target_property(qml_module_version     ${target} QT_QML_MODULE_VERSION)
+    get_target_property(past_major_versions    ${target} QT_QML_MODULE_PAST_MAJOR_VERSIONS)
 
     if(NOT output_dir)
         # Probably not a qml module. We still want to support tooling for this
@@ -1331,6 +1335,19 @@ function(qt6_target_qml_sources target)
         string(APPEND arg_PREFIX "/")
     endif()
 
+    if (qml_module_version MATCHES "^([0-9]+)\\.")
+        set(qml_module_files_versions "${CMAKE_MATCH_1}.0")
+    else()
+        message(FATAL_ERROR
+            "No major version found in '${qml_module_version}'."
+        )
+    endif()
+    if (past_major_versions OR past_major_versions STREQUAL "0")
+        foreach (past_major_version ${past_major_versions})
+            list(APPEND qml_module_files_versions "${past_major_version}.0")
+        endforeach()
+    endif()
+
     # Linting and cachegen can still occur for a target that isn't a qml module,
     # but for such targets, there is no qmldir file to update.
     if(arg_NO_LINT)
@@ -1469,7 +1486,7 @@ function(qt6_target_qml_sources target)
                 get_source_file_property(qml_file_internal  ${qml_file_src} QT_QML_INTERNAL_TYPE)
 
                 if (NOT qml_file_versions)
-                    set(qml_file_versions ${qml_module_version})
+                    set(qml_file_versions ${qml_module_files_versions})
                 endif()
 
                 set(qmldir_file_contents "")
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
index b823c48d82..0a3dd4abd1 100644
--- a/src/qmltest/CMakeLists.txt
+++ b/src/qmltest/CMakeLists.txt
@@ -2,9 +2,6 @@
 ## QuickTest Module:
 #####################################################################
 
-set_source_files_properties(TestCase.qml SignalSpy.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "1.0;6.0"
-)
 set_source_files_properties(testlogger.js PROPERTIES
     QT_QML_SKIP_QMLDIR_ENTRY TRUE
 )
diff --git a/src/quickcontrols2/basic/CMakeLists.txt b/src/quickcontrols2/basic/CMakeLists.txt
index 2aa0f8adb9..c77d1bc3b1 100644
--- a/src/quickcontrols2/basic/CMakeLists.txt
+++ b/src/quickcontrols2/basic/CMakeLists.txt
@@ -62,177 +62,48 @@ set(qml_files
     "Tumbler.qml"
     "VerticalHeaderView.qml"
 )
-set_source_files_properties(AbstractButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(Action.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.3;6.0"
 )
 set_source_files_properties(ActionGroup.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.3;6.0"
 )
-set_source_files_properties(ApplicationWindow.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(BusyIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Button.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ButtonGroup.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ComboBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Container.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Control.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(DelayButton.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.2;6.0"
 )
-set_source_files_properties(Dial.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(Dialog.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
 set_source_files_properties(DialogButtonBox.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(Drawer.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Frame.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(GroupBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(HorizontalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
-set_source_files_properties(ItemDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Label.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Menu.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(MenuBar.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.3;6.0"
 )
 set_source_files_properties(MenuBarItem.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.3;6.0"
 )
-set_source_files_properties(MenuItem.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(MenuSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(Page.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(PageIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Pane.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Popup.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ProgressBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RangeSlider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(RoundButton.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(ScrollBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(ScrollView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.2;6.0"
 )
 set_source_files_properties(SelectionRectangle.qml PROPERTIES
     QT_QML_SOURCE_VERSION "6.2"
 )
-set_source_files_properties(Slider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SpinBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(SplitView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.13;6.0"
 )
-set_source_files_properties(StackView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwipeDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Switch.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwitchDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwipeView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TabBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TabButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextArea.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextField.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ToolBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ToolButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(ToolSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(ToolTip.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Tumbler.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
@@ -240,6 +111,7 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
 qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin
     URI "QtQuick.Controls.Basic"
     VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2
     CLASS_NAME QtQuickControls2BasicStylePlugin
     PLUGIN_TARGET qtquickcontrols2basicstyleplugin
     NO_PLUGIN_OPTIONAL
diff --git a/src/quickcontrols2/fusion/CMakeLists.txt b/src/quickcontrols2/fusion/CMakeLists.txt
index cbc9e03279..92e8a43d32 100644
--- a/src/quickcontrols2/fusion/CMakeLists.txt
+++ b/src/quickcontrols2/fusion/CMakeLists.txt
@@ -54,150 +54,36 @@ set(qml_files
     "Tumbler.qml"
     "VerticalHeaderView.qml"
 )
-set_source_files_properties(ApplicationWindow.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(BusyIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Button.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ComboBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(DelayButton.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.2;6.0"
 )
-set_source_files_properties(Dial.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(Dialog.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
 set_source_files_properties(DialogButtonBox.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(Drawer.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Frame.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(GroupBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(HorizontalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
-set_source_files_properties(ItemDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Label.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Menu.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(MenuBar.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.3;6.0"
 )
 set_source_files_properties(MenuBarItem.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.3;6.0"
 )
-set_source_files_properties(MenuItem.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(MenuSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(Page.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(PageIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Pane.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Popup.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ProgressBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RangeSlider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(RoundButton.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(ScrollBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Slider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SpinBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(SplitView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.13;6.0"
 )
-set_source_files_properties(SwipeDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwitchDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Switch.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TabBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TabButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextArea.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextField.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ToolBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ToolButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(ToolSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(ToolTip.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Tumbler.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
@@ -205,6 +91,7 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
 qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin
     URI "QtQuick.Controls.Fusion"
     VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2
     CLASS_NAME QtQuickControls2FusionStylePlugin
     IMPORTS
         QtQuick.Controls.Basic/auto
diff --git a/src/quickcontrols2/fusion/impl/CMakeLists.txt b/src/quickcontrols2/fusion/impl/CMakeLists.txt
index 8aca54d560..2156508843 100644
--- a/src/quickcontrols2/fusion/impl/CMakeLists.txt
+++ b/src/quickcontrols2/fusion/impl/CMakeLists.txt
@@ -10,13 +10,11 @@ set(qml_files
     "SliderHandle.qml"
     "SwitchIndicator.qml"
 )
-set_source_files_properties(${qml_files} PROPERTIES
-    QT_QML_SOURCE_VERSION "2.3"
-)
 
 qt_internal_add_qml_module(qtquickcontrols2fusionstyleimplplugin
     URI "QtQuick.Controls.Fusion.impl"
     VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2
     CLASS_NAME QtQuickControls2FusionStyleImplPlugin
     PLUGIN_TARGET qtquickcontrols2fusionstyleimplplugin
     NO_PLUGIN_OPTIONAL
diff --git a/src/quickcontrols2/imagine/CMakeLists.txt b/src/quickcontrols2/imagine/CMakeLists.txt
index c1823d04fe..7308135ac2 100644
--- a/src/quickcontrols2/imagine/CMakeLists.txt
+++ b/src/quickcontrols2/imagine/CMakeLists.txt
@@ -54,150 +54,30 @@ set(qml_files
     "Tumbler.qml"
     "VerticalHeaderView.qml"
 )
-set_source_files_properties(ApplicationWindow.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(BusyIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Button.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ComboBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(DelayButton.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.2;6.0"
 )
-set_source_files_properties(Dial.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(Dialog.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
 set_source_files_properties(DialogButtonBox.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(Drawer.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Frame.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(GroupBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(HorizontalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
-set_source_files_properties(ItemDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Label.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Menu.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(MenuItem.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(MenuSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(PageIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Page.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Pane.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Popup.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ProgressBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RangeSlider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(RoundButton.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(ScrollView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Slider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SpinBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(SplitView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.13;6.0"
 )
-set_source_files_properties(StackView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwipeDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwipeView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Switch.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwitchDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextField.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextArea.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TabBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TabButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ToolBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ToolButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(ToolSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(ToolTip.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Tumbler.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
@@ -205,6 +85,7 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
 qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin
     URI "QtQuick.Controls.Imagine"
     VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2
     CLASS_NAME QtQuickControls2ImagineStylePlugin
     IMPORTS
         QtQuick.Controls.Basic/auto
diff --git a/src/quickcontrols2/imagine/impl/CMakeLists.txt b/src/quickcontrols2/imagine/impl/CMakeLists.txt
index 87cfc332a6..7c576dbad6 100644
--- a/src/quickcontrols2/imagine/impl/CMakeLists.txt
+++ b/src/quickcontrols2/imagine/impl/CMakeLists.txt
@@ -5,9 +5,6 @@
 set(qml_files
     "OpacityMask.qml"
 )
-set_source_files_properties(OpacityMask.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "6.0"
-)
 
 qt_internal_add_qml_module(qtquickcontrols2imaginestyleimplplugin
     URI "QtQuick.Controls.Imagine.impl"
diff --git a/src/quickcontrols2/macos/CMakeLists.txt b/src/quickcontrols2/macos/CMakeLists.txt
index 096c776fcb..e244a4bb94 100644
--- a/src/quickcontrols2/macos/CMakeLists.txt
+++ b/src/quickcontrols2/macos/CMakeLists.txt
@@ -19,9 +19,6 @@ set(qml_files
     "ProgressBar.qml"
     "Dial.qml"
 )
-set_source_files_properties(${qml_files} PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 
 qt_internal_add_qml_module(qtquickcontrols2macosstyleplugin
     URI "QtQuick.Controls.macOS"
diff --git a/src/quickcontrols2/material/CMakeLists.txt b/src/quickcontrols2/material/CMakeLists.txt
index 3b7d2846cd..86580973c2 100644
--- a/src/quickcontrols2/material/CMakeLists.txt
+++ b/src/quickcontrols2/material/CMakeLists.txt
@@ -56,156 +56,36 @@ set(qml_files
     "Tumbler.qml"
     "VerticalHeaderView.qml"
 )
-set_source_files_properties(ApplicationWindow.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(BusyIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Button.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ComboBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(DelayButton.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.2;6.0"
 )
-set_source_files_properties(Dial.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(Dialog.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
 set_source_files_properties(DialogButtonBox.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(Drawer.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Frame.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(GroupBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(HorizontalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
-set_source_files_properties(ItemDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Label.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Menu.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(MenuBar.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.3;6.0"
 )
 set_source_files_properties(MenuBarItem.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.3;6.0"
 )
-set_source_files_properties(MenuItem.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(MenuSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(Page.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(PageIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Pane.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Popup.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ProgressBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RangeSlider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(RoundButton.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(ScrollView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Slider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SpinBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(SplitView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.13;6.0"
 )
-set_source_files_properties(StackView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwipeDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwipeView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Switch.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwitchDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TabBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TabButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextArea.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextField.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ToolBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ToolButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(ToolSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(ToolTip.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Tumbler.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
@@ -213,6 +93,7 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
 qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin
     URI "QtQuick.Controls.Material"
     VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2
     CLASS_NAME QtQuickControls2MaterialStylePlugin
     IMPORTS
         QtQuick.Controls.Basic/auto
diff --git a/src/quickcontrols2/material/impl/CMakeLists.txt b/src/quickcontrols2/material/impl/CMakeLists.txt
index 289a4b0523..d4bc7bda82 100644
--- a/src/quickcontrols2/material/impl/CMakeLists.txt
+++ b/src/quickcontrols2/material/impl/CMakeLists.txt
@@ -12,13 +12,11 @@ set(qml_files
     "SliderHandle.qml"
     "SwitchIndicator.qml"
 )
-set_source_files_properties(${qml_files} PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
 
 qt_internal_add_qml_module(qtquickcontrols2materialstyleimplplugin
     URI "QtQuick.Controls.Material.impl"
     VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2
     CLASS_NAME QtQuickControls2MaterialStyleImplPlugin
     PLUGIN_TARGET qtquickcontrols2materialstyleimplplugin
     NO_PLUGIN_OPTIONAL
diff --git a/src/quickcontrols2/universal/CMakeLists.txt b/src/quickcontrols2/universal/CMakeLists.txt
index be9aaa3af4..914f26a322 100644
--- a/src/quickcontrols2/universal/CMakeLists.txt
+++ b/src/quickcontrols2/universal/CMakeLists.txt
@@ -55,153 +55,36 @@ set(qml_files
     "Tumbler.qml"
     "VerticalHeaderView.qml"
 )
-set_source_files_properties(ApplicationWindow.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(BusyIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Button.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ComboBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(DelayButton.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.2;6.0"
 )
-set_source_files_properties(Dial.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(Dialog.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
 set_source_files_properties(DialogButtonBox.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(Drawer.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Frame.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(GroupBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(HorizontalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
-set_source_files_properties(ItemDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Label.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Menu.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(MenuBar.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.3;6.0"
 )
 set_source_files_properties(MenuBarItem.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.3;6.0"
 )
-set_source_files_properties(MenuItem.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(MenuSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(Page.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(PageIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Pane.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Popup.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ProgressBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RangeSlider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(RoundButton.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(ScrollView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Slider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SpinBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(SplitView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.13;6.0"
 )
-set_source_files_properties(StackView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwipeDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SwitchDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Switch.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TabBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TabButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextArea.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextField.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ToolBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ToolButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(ToolSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.1;6.0"
 )
-set_source_files_properties(ToolTip.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Tumbler.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
@@ -209,6 +92,7 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
 qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin
     URI "QtQuick.Controls.Universal"
     VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2
     CLASS_NAME QtQuickControls2UniversalStylePlugin
     IMPORTS
         QtQuick.Controls.Basic/auto
diff --git a/src/quickcontrols2/universal/impl/CMakeLists.txt b/src/quickcontrols2/universal/impl/CMakeLists.txt
index 796806a524..78a0d2e028 100644
--- a/src/quickcontrols2/universal/impl/CMakeLists.txt
+++ b/src/quickcontrols2/universal/impl/CMakeLists.txt
@@ -7,13 +7,11 @@ set(qml_files
     "RadioIndicator.qml"
     "SwitchIndicator.qml"
 )
-set_source_files_properties(${qml_files} PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
 
 qt_internal_add_qml_module(qtquickcontrols2universalstyleimplplugin
     URI "QtQuick.Controls.Universal.impl"
     VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2
     CLASS_NAME QtQuickControls2UniversalStyleImplPlugin
     PLUGIN_TARGET qtquickcontrols2universalstyleimplplugin
     NO_PLUGIN_OPTIONAL
diff --git a/src/quickcontrols2/windows/CMakeLists.txt b/src/quickcontrols2/windows/CMakeLists.txt
index 9b6c942524..0822a9538a 100644
--- a/src/quickcontrols2/windows/CMakeLists.txt
+++ b/src/quickcontrols2/windows/CMakeLists.txt
@@ -18,9 +18,6 @@ set(qml_files
     "ScrollBar.qml"
     "ScrollView.qml"
 )
-set_source_files_properties(${qml_files} PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 
 qt_internal_add_qml_module(qtquickcontrols2windowsstyleplugin
     URI "QtQuick.Controls.Windows"
diff --git a/src/quicknativestyle/CMakeLists.txt b/src/quicknativestyle/CMakeLists.txt
index 428938c217..b60f157bc1 100644
--- a/src/quicknativestyle/CMakeLists.txt
+++ b/src/quicknativestyle/CMakeLists.txt
@@ -17,12 +17,8 @@ set(qml_files
     "controls/DefaultProgressBar.qml"
     "controls/DefaultDial.qml"
 )
-set_source_files_properties(${qml_files} PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
 
 if(MACOS)
-    # TODO: QT_QML_SOURCE_VERSION wasn't set on this file before, should it be?
     list(APPEND qml_files "util/FocusFrame.qml")
 endif()