Create branch for qds-3.9 using qt6_add_qml_module

Change-Id: Ic9884c60a28d2947e06c898ea314a612e66caee0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

11 files changed, 25 insertions, 51 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be31b7d..0f03162 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,20 @@
 cmake_minimum_required(VERSION 3.16)
 
+##PROJECT_VERSION_MAJOR = 6
 project(QtQuickDesignerComponents
     DESCRIPTION "QtQuick Designer Components"
     HOMEPAGE_URL "https://qt.io/"
-    VERSION "6.2.4"
+    VERSION "6.4.0"
     LANGUAGES CXX C
 )
 
+include(CMakePrintHelpers)
+
+cmake_print_variables(PROJECT_SOURCE_DIR)
+cmake_print_variables(PROJECT_VERSION_MAJOR)
+message("$(PROJECT_SOURCE_DIR)")
+message("$(PROJECT_VERSION_MAJOR)")
+
 set(CMAKE_AUTOMOC ON)
 
 find_package(Qt6
@@ -17,6 +25,9 @@ find_package(Qt6
         Quick
         Core
         Qml
+        Gui
 )
 
-qt_build_repo()
+qt_standard_project_setup()
+add_subdirectory(src)
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3af0139..73f035a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt_path_join(targetbasedir ${CMAKE_BINARY_DIR} "qml")
-qt_path_join(qmlinstalldir ${QT_INSTALL_DIR} ${INSTALL_QMLDIR})
+###qt_path_join(targetbasedir ${CMAKE_BINARY_DIR} "qml")
+###qt_path_join(qmlinstalldir ${QT_INSTALL_DIR} ${INSTALL_QMLDIR})
 
 add_subdirectory(imports)
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
index 87c84b8..152f362 100644
--- a/src/imports/CMakeLists.txt
+++ b/src/imports/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(compatibility)
 add_subdirectory(components)
 add_subdirectory(effects_qt6)
 add_subdirectory(flowview)
diff --git a/src/imports/application/CMakeLists.txt b/src/imports/application/CMakeLists.txt
index 175a85f..8e9b68e 100644
--- a/src/imports/application/CMakeLists.txt
+++ b/src/imports/application/CMakeLists.txt
@@ -2,16 +2,12 @@
 ## QuickStudioApplicationModule:
 #####################################################################
 
-qt_internal_add_qml_module(QuickStudioApplication
+qt6_add_qml_module(QuickStudioApplication
     URI "QtQuick.Studio.Application"
     VERSION "${PROJECT_VERSION}"
     DESIGNER_SUPPORTED
-    PAST_MAJOR_VERSIONS 1
- INCLUDE_DIRECTORIES
-    ${CMAKE_CURRENT_SOURCE_DIR}
     SOURCES
         quickstudioapplication.cpp quickstudioapplication_p.h
-    PUBLIC_LIBRARIES
-        Qt::Qml
-        Qt::Quick
 )
+
+target_link_libraries(QuickStudioApplication PRIVATE Qt6::Gui)
diff --git a/src/imports/components/CMakeLists.txt b/src/imports/components/CMakeLists.txt
index 9f28a52..7f87f1a 100644
--- a/src/imports/components/CMakeLists.txt
+++ b/src/imports/components/CMakeLists.txt
@@ -1,8 +1,7 @@
-qt_internal_add_qml_module(QuickStudioComponents
+qt6_add_qml_module(QuickStudioComponents
     URI "QtQuick.Studio.Components"
     VERSION "${PROJECT_VERSION}"
     DESIGNER_SUPPORTED
-    NO_SYNC_QT
     PAST_MAJOR_VERSIONS 1
         QML_FILES
         ArcItem.qml
@@ -20,11 +19,4 @@ qt_internal_add_qml_module(QuickStudioComponents
         StraightArrow.qml
 )
 
-qt_internal_add_docs(QuickStudioComponents
-    doc/qtquickstudiocomponents.qdocconf
-)
-
-if(QT_FEATURE_quick_designer AND QT_BUILD_SHARED_LIBS)
-    add_subdirectory(designer)
-endif()
 
diff --git a/src/imports/effects_qt6/CMakeLists.txt b/src/imports/effects_qt6/CMakeLists.txt
index 1b51c72..9e14d8e 100644
--- a/src/imports/effects_qt6/CMakeLists.txt
+++ b/src/imports/effects_qt6/CMakeLists.txt
@@ -1,8 +1,7 @@
-qt_internal_add_qml_module(QuickStudioEffects
+qt6_add_qml_module(QuickStudioEffects
     URI "QtQuick.Studio.Effects"
     VERSION "${PROJECT_VERSION}"
     DESIGNER_SUPPORTED
-    NO_SYNC_QT
     PAST_MAJOR_VERSIONS 1
     QML_FILES
         FastBlurItem.qml
@@ -52,7 +51,4 @@ qt_internal_add_qml_module(QuickStudioEffects
         ZoomBlurEffect.qml
 )
 
-if(QT_FEATURE_quick_designer AND QT_BUILD_SHARED_LIBS)
-    add_subdirectory(designer)
-endif()
 
diff --git a/src/imports/flowview/CMakeLists.txt b/src/imports/flowview/CMakeLists.txt
index e96174b..ab076b7 100644
--- a/src/imports/flowview/CMakeLists.txt
+++ b/src/imports/flowview/CMakeLists.txt
@@ -3,11 +3,10 @@ set_source_files_properties(FlowState.qml
         QT_QML_SINGLETON_TYPE true
 )
 
-qt_internal_add_qml_module(FlowView
+qt6_add_qml_module(FlowView
     URI "FlowView"
     VERSION "${PROJECT_VERSION}"
     DESIGNER_SUPPORTED
-    NO_SYNC_QT
     PAST_MAJOR_VERSIONS 1
     NO_GENERATE_QMLDIR
     QML_FILES
@@ -38,7 +37,3 @@ qt_internal_add_qml_module(FlowView
         qmldir
 )
 
-if(QT_FEATURE_quick_designer AND QT_BUILD_SHARED_LIBS)
-    add_subdirectory(designer)
-endif()
-
diff --git a/src/imports/logichelper/CMakeLists.txt b/src/imports/logichelper/CMakeLists.txt
index 0d2a234..b803232 100644
--- a/src/imports/logichelper/CMakeLists.txt
+++ b/src/imports/logichelper/CMakeLists.txt
@@ -1,8 +1,7 @@
-qt_internal_add_qml_module(QuickStudioLogicHelper
+qt6_add_qml_module(QuickStudioLogicHelper
     URI "QtQuick.Studio.LogicHelper"
     VERSION "${PROJECT_VERSION}"
     DESIGNER_SUPPORTED
-    NO_SYNC_QT
     PAST_MAJOR_VERSIONS 1
     QML_FILES
         BidirectionalBinding.qml
@@ -14,11 +13,4 @@ qt_internal_add_qml_module(QuickStudioLogicHelper
         NotOperator.qml
 )
 
-qt_internal_add_docs(QuickStudioLogicHelper
-    doc/qtquickstudiologichelper.qdocconf
-)
-
-if(QT_FEATURE_quick_designer AND QT_BUILD_SHARED_LIBS)
-    add_subdirectory(designer)
-endif()
 
diff --git a/src/imports/multitext/CMakeLists.txt b/src/imports/multitext/CMakeLists.txt
index 6c4fce9..7a70daf 100644
--- a/src/imports/multitext/CMakeLists.txt
+++ b/src/imports/multitext/CMakeLists.txt
@@ -1,8 +1,7 @@
-qt_internal_add_qml_module(QuickStudioMultiText
+qt6_add_qml_module(QuickStudioMultiText
     URI "QtQuick.Studio.MultiText"
     VERSION "${PROJECT_VERSION}"
     DESIGNER_SUPPORTED
-    NO_SYNC_QT
     PAST_MAJOR_VERSIONS 1
     QML_FILES
         MultiTextElement.qml
@@ -10,7 +9,3 @@ qt_internal_add_qml_module(QuickStudioMultiText
         MultiTextException.qml
 )
 
-if(QT_FEATURE_quick_designer AND QT_BUILD_SHARED_LIBS)
-    add_subdirectory(designer)
-endif()
-
diff --git a/src/imports/tools/eventsimulator/CMakeLists.txt b/src/imports/tools/eventsimulator/CMakeLists.txt
index e39fb92..66718e9 100644
--- a/src/imports/tools/eventsimulator/CMakeLists.txt
+++ b/src/imports/tools/eventsimulator/CMakeLists.txt
@@ -3,11 +3,10 @@ set_source_files_properties(EventSimulator.qml
         QT_QML_SINGLETON_TYPE true
 )
 
-qt_internal_add_qml_module(QuickStudioEventSimulator
+qt6_add_qml_module(QuickStudioEventSimulator
     URI "QtQuick.Studio.EventSimulator"
     VERSION "${PROJECT_VERSION}"
     DESIGNER_SUPPORTED
-    NO_SYNC_QT
     PAST_MAJOR_VERSIONS 1
     QML_FILES
         EventSimulator.qml
diff --git a/src/imports/tools/eventsystem/CMakeLists.txt b/src/imports/tools/eventsystem/CMakeLists.txt
index 719534d..34cc22f 100644
--- a/src/imports/tools/eventsystem/CMakeLists.txt
+++ b/src/imports/tools/eventsystem/CMakeLists.txt
@@ -3,11 +3,10 @@ set_source_files_properties(EventSystem.qml
         QT_QML_SINGLETON_TYPE true
 )
 
-qt_internal_add_qml_module(QuickStudioEventSystem
+qt6_add_qml_module(QuickStudioEventSystem
     URI "QtQuick.Studio.EventSystem"
     VERSION "${PROJECT_VERSION}"
     DESIGNER_SUPPORTED
-    NO_SYNC_QT
     PAST_MAJOR_VERSIONS 1
     QML_FILES
         EventSystem.qml