aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-11-15 18:14:05 +0100
committerUlf Hermann <ulf.hermann@qt.io>2020-11-16 11:56:41 +0100
commitea365e3f893d6b64d0e281d7e7c8cc8826da2dea (patch)
tree41f760cf5ec180c4c47a6463db3fcb28f2c1f639 /src
parent55318c95d6bf72132ded283971450b4f56674997 (diff)
Add past major version 1 to QtQuick.tooling and 6 to its components
Change-Id: I09e29b85949eac270c6cee711408b8a09dea79a8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/tooling/CMakeLists.txt3
-rw-r--r--src/imports/tooling/qmldir9
2 files changed, 11 insertions, 1 deletions
diff --git a/src/imports/tooling/CMakeLists.txt b/src/imports/tooling/CMakeLists.txt
index 0a638f3017..a6273a1ee5 100644
--- a/src/imports/tooling/CMakeLists.txt
+++ b/src/imports/tooling/CMakeLists.txt
@@ -17,10 +17,11 @@ qt_internal_add_qml_module(quicktooling
VERSION "${CMAKE_PROJECT_VERSION}"
GENERATE_QMLTYPES
INSTALL_QMLTYPES
+ PAST_MAJOR_VERSIONS 1
)
set_source_files_properties(${qml_files} PROPERTIES
- QT_QML_SOURCE_VERSION "1.2"
+ QT_QML_SOURCE_VERSION "1.2;6.0"
)
qt6_target_qml_files(quicktooling
diff --git a/src/imports/tooling/qmldir b/src/imports/tooling/qmldir
index 2235f36d40..e894d41ff8 100644
--- a/src/imports/tooling/qmldir
+++ b/src/imports/tooling/qmldir
@@ -8,3 +8,12 @@ Module 1.2 Module.qml
Parameter 1.2 Parameter.qml
Property 1.2 Property.qml
Signal 1.2 Signal.qml
+
+Component 6.0 Component.qml
+Enum 6.0 Enum.qml
+Member 6.0 Member.qml
+Method 6.0 Method.qml
+Module 6.0 Module.qml
+Parameter 6.0 Parameter.qml
+Property 6.0 Property.qml
+Signal 6.0 Signal.qml