QtScxml module cmake port

Task-number: QTBUG-89828
Change-Id: I95ec7905654bd3eaf61b22082ee1040aba4b9b24
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

30 files changed, 56 insertions, 159 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a121516..533e26c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,16 @@
 # Generated from qtscxml.pro.
 
-cmake_minimum_required(VERSION 3.15.0)
+cmake_minimum_required(VERSION 3.16)
 
 include(.cmake.conf)
 project(QtScxml
     VERSION "${QT_REPO_MODULE_VERSION}"
-    DESCRIPTION "Qt Scxml Libraries"
+    DESCRIPTION "Qt Scxml and StateMachine libraries"
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C
 )
 
-# special case begin
 find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Qml Gui)
-# special case end
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Qml Widgets Quick OpenGL OpenGLWidgets)
 
 qt_build_repo()
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 9f29e11..16d158c 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -1,13 +1,12 @@
-version: 1
+version: 2
 accept_configuration:
   condition: property
-  property: host.os
-  equals_property: target.os
+  property: features
+  not_contains_value: Disable
 
-build_instructions:
-  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
-  - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml"
-  - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
+instructions:
+  Build:
+    - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
 
-test_instructions:
-  - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml"
+  Test:
+    - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml"
diff --git a/dependencies.yaml b/dependencies.yaml
index dd070bf..f98767f 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,7 +1,7 @@
 dependencies:
   ../qtbase:
-    ref: eb98bed4e76bb0fa6bad8474f2f370334cb70f6c
+    ref: 167bcafcb6b1988047bec8b4d67c994fc8c85c14
     required: true
   ../qtdeclarative:
-    ref: 229987d91505203e5a1577651b65880e58239ac7
+    ref: 948c56ca051d9a2d0f806b8bce3a3170751f5750
     required: true
diff --git a/examples/widgets/animation/sub-attaq/CMakeLists.txt b/examples/widgets/animation/sub-attaq/CMakeLists.txt
index 9356de1..1e6dc8a 100644
--- a/examples/widgets/animation/sub-attaq/CMakeLists.txt
+++ b/examples/widgets/animation/sub-attaq/CMakeLists.txt
@@ -19,7 +19,6 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS StateMachine)
 find_package(Qt6 COMPONENTS Widgets)
-find_package(Qt6 COMPONENTS OpenGL) # special case
 
 qt_add_executable(sub-attaq
     animationmanager.cpp animationmanager.h
diff --git a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt
index 2dce7f4..979cca9 100644
--- a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt
+++ b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt
@@ -61,7 +61,7 @@ qt6_add_resources(padnavigator "padnavigator"
         ${padnavigator_resource_files}
 )
 
-if(TARGET Qt::OpenGL)
+if(TARGET Qt::OpenGL AND TARGET Qt::OpenGLWidgets)
     target_link_libraries(padnavigator PUBLIC
         Qt::OpenGL
         Qt::OpenGLWidgets
diff --git a/src/imports/scxmlstatemachine/CMakeLists.txt b/src/imports/scxmlstatemachine/CMakeLists.txt
index fd75975..25ed61d 100644
--- a/src/imports/scxmlstatemachine/CMakeLists.txt
+++ b/src/imports/scxmlstatemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## scxml Plugin:
 #####################################################################
 
-qt_add_qml_module(declarative_scxml # special case
+qt_internal_add_qml_module(declarative_scxml # special case
     URI "QtScxml"
     VERSION "5.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QScxmlStateMachinePlugin
diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt
index 2f33242..5cbe931 100644
--- a/src/imports/statemachine/CMakeLists.txt
+++ b/src/imports/statemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtqmlstatemachine Plugin:
 #####################################################################
 
-qt_add_qml_module(qtqmlstatemachine
+qt_internal_add_qml_module(qtqmlstatemachine
     URI "QtQml.StateMachine"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQmlStateMachinePlugin
diff --git a/src/scxml/CMakeLists.txt b/src/scxml/CMakeLists.txt
index 0851f29..a36ef5e 100644
--- a/src/scxml/CMakeLists.txt
+++ b/src/scxml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Scxml Module:
 #####################################################################
 
-qt_add_module(Scxml
+qt_internal_add_module(Scxml
     QMAKE_MODULE_CONFIG c++11 qscxmlc
     SOURCES
         qscxmlcompiler.cpp qscxmlcompiler.h qscxmlcompiler_p.h
@@ -40,7 +40,7 @@ qt_add_module(Scxml
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel
+qt_internal_extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel
     SOURCES
         qscxmlecmascriptdatamodel.cpp qscxmlecmascriptdatamodel.h
         qscxmlecmascriptplatformproperties.cpp qscxmlecmascriptplatformproperties_p.h
@@ -59,8 +59,8 @@ qt_extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel
 # prf2build.input = "FEATURES"
 # prf2build.name = "COPY" "${QMAKE_FILE_IN}"
 # prf2build.output = "$$[QT_INSTALL_DATA/get]/mkspecs/features/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}"
-qt_add_docs(Scxml
+qt_internal_add_docs(Scxml
     doc/qtscxml.qdocconf
 )
 
-include(Qt6ScxmlMacros.cmake)    # special case
+include(Qt6ScxmlMacros.cmake)
diff --git a/src/statemachine/CMakeLists.txt b/src/statemachine/CMakeLists.txt
index 49639c3..d4d21b2 100644
--- a/src/statemachine/CMakeLists.txt
+++ b/src/statemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## StateMachine Module:
 #####################################################################
 
-qt_add_module(StateMachine
+qt_internal_add_module(StateMachine
     SOURCES
         qabstractstate.cpp qabstractstate.h qabstractstate_p.h
         qabstracttransition.cpp qabstracttransition.h qabstracttransition_p.h
@@ -29,7 +29,7 @@ qt_add_module(StateMachine
 ## Scopes:
 #####################################################################
 
-qt_extend_target(StateMachine CONDITION QT_FEATURE_qeventtransition
+qt_internal_extend_target(StateMachine CONDITION QT_FEATURE_qeventtransition
     SOURCES
         gui/qbasickeyeventtransition.cpp gui/qbasickeyeventtransition_p.h
         gui/qbasicmouseeventtransition.cpp gui/qbasicmouseeventtransition_p.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 62f6731..e9b300c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,10 +3,10 @@
 if(QT_BUILD_STANDALONE_TESTS)
     # Add qt_find_package calls for extra dependencies that need to be found when building
     # the standalone tests here.
-    cmake_minimum_required(VERSION 3.15.0)
-    project(QtScxmlTests VERSION 6.0.0 LANGUAGES C CXX)
-    find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core Scxml Test) # special case
-    find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS Qml Gui) # special case
+    cmake_minimum_required(VERSION 3.16)
+    project(QtScxmlTests VERSION 6.1.0 LANGUAGES C CXX)
+    find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core Scxml Test)
+    find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS Qml Gui)
     qt_set_up_standalone_tests_build()
 endif()
 qt_build_tests()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index bc13ede..5331b6b 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,8 +1,5 @@
 # Generated from auto.pro.
 
-# special case begin
-# add_subdirectory(cmake)
-# special case end
 add_subdirectory(compiled)
 add_subdirectory(dynamicmetaobject)
 add_subdirectory(parser)
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
deleted file mode 100644
index 9c9e098..0000000
--- a/tests/auto/cmake/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(qmake_cmake_files)
-
-enable_testing()
-
-find_package(Qt5Core REQUIRED)
-
-include("${_Qt5CTestMacros}")
-
-test_module_includes(
-  Scxml QScxmlEvent
-)
-
-expect_pass(test_qtscxml_module)
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
deleted file mode 100644
index e91ff69..0000000
--- a/tests/auto/cmake/cmake.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-# Cause make to do nothing.
-TEMPLATE = subdirs
-
-CMAKE_QT_MODULES_UNDER_TEST = scxml
-
-CONFIG += ctest_testcase
diff --git a/tests/auto/cmake/test_qtscxml_module/CMakeLists.txt b/tests/auto/cmake/test_qtscxml_module/CMakeLists.txt
deleted file mode 100644
index e2cf03a..0000000
--- a/tests/auto/cmake/test_qtscxml_module/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(test_qtscxml_module)
-
-find_package(Qt5Scxml REQUIRED)
-
-set(MAIN_SRCS main.cpp)
-qt5_add_statecharts(MAIN_SRCS
-    ../../compiled/connection.scxml
-
-    # unused, just for testing whether it's possible to pass multiple files
-    ../../compiled/topmachine.scxml
-)
-add_executable(mainapp ${MAIN_SRCS})
-target_include_directories(mainapp PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(mainapp Qt5::Scxml)
diff --git a/tests/auto/cmake/test_qtscxml_module/main.cpp b/tests/auto/cmake/test_qtscxml_module/main.cpp
deleted file mode 100644
index 2d081df..0000000
--- a/tests/auto/cmake/test_qtscxml_module/main.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "connection.h"
-
-int main(int argc, char **argv)
-{
-  Q_UNUSED(argc);
-  Q_UNUSED(argv);
-
-  Connection connection;
-  Q_UNUSED(connection);
-  return 0;
-}
diff --git a/tests/auto/compiled/CMakeLists.txt b/tests/auto/compiled/CMakeLists.txt
index aa2c70c..76fb42f 100644
--- a/tests/auto/compiled/CMakeLists.txt
+++ b/tests/auto/compiled/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_compiled Test:
 #####################################################################
 
-qt_add_test(tst_compiled
+qt_internal_add_test(tst_compiled
     SOURCES
         tst_compiled.cpp
     PUBLIC_LIBRARIES
@@ -20,7 +20,7 @@ set(tst_compiled_resource_files
     "topmachine.scxml"
 )
 
-qt_add_resource(tst_compiled "tst_compiled"
+qt_internal_add_resource(tst_compiled "tst_compiled"
     PREFIX
         "/"
     FILES
@@ -29,7 +29,7 @@ qt_add_resource(tst_compiled "tst_compiled"
 
 
 # Statecharts:
-add_qt_statecharts(tst_compiled FILES
+qt6_add_statecharts(tst_compiled
     ids1.scxml
     eventnames1.scxml
     eventnames2.scxml
diff --git a/tests/auto/dynamicmetaobject/CMakeLists.txt b/tests/auto/dynamicmetaobject/CMakeLists.txt
index 2367bdf..d5d0d39 100644
--- a/tests/auto/dynamicmetaobject/CMakeLists.txt
+++ b/tests/auto/dynamicmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_dynamicmetaobject Test:
 #####################################################################
 
-qt_add_test(tst_dynamicmetaobject
+qt_internal_add_test(tst_dynamicmetaobject
     SOURCES
         tst_dynamicmetaobject.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(tst_dynamicmetaobject_resource_files
     "test1.scxml"
 )
 
-qt_add_resource(tst_dynamicmetaobject "tst_dynamicmetaobject"
+qt_internal_add_resource(tst_dynamicmetaobject "tst_dynamicmetaobject"
     PREFIX
         "/tst_dynamicmetaobject"
     FILES
diff --git a/tests/auto/parser/CMakeLists.txt b/tests/auto/parser/CMakeLists.txt
index cc194d7..3beb7c9 100644
--- a/tests/auto/parser/CMakeLists.txt
+++ b/tests/auto/parser/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_parser Test:
 #####################################################################
 
-qt_add_test(tst_parser
+qt_internal_add_test(tst_parser
     SOURCES
         tst_parser.cpp
     PUBLIC_LIBRARIES
@@ -97,7 +97,7 @@ set(tst_parser_resource_files
     "data/test1.scxml.errors"
 )
 
-qt_add_resource(tst_parser "tst_parser"
+qt_internal_add_resource(tst_parser "tst_parser"
     PREFIX
         "/tst_parser"
     FILES
diff --git a/tests/auto/qml/qqmlmetatype/CMakeLists.txt b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
index 8188bdf..f33edc6 100644
--- a/tests/auto/qml/qqmlmetatype/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlmetatype Test:
 #####################################################################
 
-qt_add_test(tst_qqmlmetatype
+qt_internal_add_test(tst_qqmlmetatype
     SOURCES
         tst_qqmlmetatype.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
index 4ffe1c3..9284386 100644
--- a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlstatemachine Test:
 #####################################################################
 
-qt_add_test(tst_qqmlstatemachine
+qt_internal_add_test(tst_qqmlstatemachine
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlstatemachine.cpp
diff --git a/tests/auto/qmltest/statemachine/CMakeLists.txt b/tests/auto/qmltest/statemachine/CMakeLists.txt
index fafaf38..28fc1f8 100644
--- a/tests/auto/qmltest/statemachine/CMakeLists.txt
+++ b/tests/auto/qmltest/statemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## statemachine Test:
 #####################################################################
 
-qt_add_test(statemachine
+qt_internal_add_test(statemachine
     GUI
     QMLTEST
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qstatemachine/qstate/CMakeLists.txt b/tests/auto/qstatemachine/qstate/CMakeLists.txt
index 927325b..7f6f2ee 100644
--- a/tests/auto/qstatemachine/qstate/CMakeLists.txt
+++ b/tests/auto/qstatemachine/qstate/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstate Test:
 #####################################################################
 
-qt_add_test(tst_qstate
+qt_internal_add_test(tst_qstate
     SOURCES
         tst_qstate.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qstatemachine/qstatemachine/CMakeLists.txt b/tests/auto/qstatemachine/qstatemachine/CMakeLists.txt
index 7c1e605..1ce2dc6 100644
--- a/tests/auto/qstatemachine/qstatemachine/CMakeLists.txt
+++ b/tests/auto/qstatemachine/qstatemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstatemachine Test:
 #####################################################################
 
-qt_add_test(tst_qstatemachine
+qt_internal_add_test(tst_qstatemachine
     SOURCES
         tst_qstatemachine.cpp
     PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ qt_add_test(tst_qstatemachine
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qstatemachine CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qstatemachine CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/scion/CMakeLists.txt b/tests/auto/scion/CMakeLists.txt
index 3b05527..4dc91ff 100644
--- a/tests/auto/scion/CMakeLists.txt
+++ b/tests/auto/scion/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_scion Test:
 #####################################################################
 
-qt_add_test(tst_scion
+qt_internal_add_test(tst_scion
     SOURCES
         tst_scion.cpp
     DEFINES
@@ -44,13 +44,11 @@ qt_add_test(tst_scion
 #### Keys ignored in scope 3:.:.:scion.pro:defineReplace(nameTheClass):
 # cn = "1"
 
-qt_extend_target(tst_scion CONDITION MSVC AND WIN32
+qt_internal_extend_target(tst_scion CONDITION MSVC AND WIN32
     COMPILE_OPTIONS
         /bigobj
 )
 
-# special case begin
-
 # For a better explanation about the "blacklisted" tests, see tst_scion.cpp
 # <invoke>
 set(blacklisted
@@ -121,7 +119,7 @@ foreach(f ${allfiles})
     )
 endforeach()
 
-add_qt_resource(tst_scion "scion"
+qt_internal_add_resource(tst_scion "scion"
     PREFIX "/"
     FILES ${allfiles}
 )
@@ -135,5 +133,3 @@ target_sources(tst_scion
         ${CMAKE_CURRENT_BINARY_DIR}/scxml/compiled_tests.h
         ${CMAKE_CURRENT_BINARY_DIR}/scxml/scion.h
 )
-
-# special case end
diff --git a/tests/auto/statemachine/CMakeLists.txt b/tests/auto/statemachine/CMakeLists.txt
index 9f31b09..61bda10 100644
--- a/tests/auto/statemachine/CMakeLists.txt
+++ b/tests/auto/statemachine/CMakeLists.txt
@@ -4,12 +4,15 @@
 ## tst_statemachine Test:
 #####################################################################
 
-qt_add_test(tst_statemachine
+qt_internal_add_test(tst_statemachine
     SOURCES
         tst_statemachine.cpp
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Qml
+        Qt::Scxml
+    LIBRARIES
+        Qt::CorePrivate
         Qt::ScxmlPrivate
 )
 
@@ -26,7 +29,7 @@ set(tst_statemachine_resource_files
     "statenamesnested.scxml"
 )
 
-qt_add_resource(tst_statemachine "tst_statemachine"
+qt_internal_add_resource(tst_statemachine "tst_statemachine"
     PREFIX
         "/tst_statemachine"
     FILES
diff --git a/tests/auto/statemachineinfo/CMakeLists.txt b/tests/auto/statemachineinfo/CMakeLists.txt
index c708b39..8be6491 100644
--- a/tests/auto/statemachineinfo/CMakeLists.txt
+++ b/tests/auto/statemachineinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_statemachineinfo Test:
 #####################################################################
 
-qt_add_test(tst_statemachineinfo
+qt_internal_add_test(tst_statemachineinfo
     SOURCES
         tst_statemachineinfo.cpp
     PUBLIC_LIBRARIES
@@ -18,7 +18,7 @@ set(tst_statemachineinfo_resource_files
     "statemachine.scxml"
 )
 
-qt_add_resource(tst_statemachineinfo "tst_statemachineinfo"
+qt_internal_add_resource(tst_statemachineinfo "tst_statemachineinfo"
     PREFIX
         "/tst_statemachineinfo"
     FILES
diff --git a/tests/manual/cppgen/CMakeLists.txt b/tests/manual/cppgen/CMakeLists.txt
index 8584067..e2d0660 100644
--- a/tests/manual/cppgen/CMakeLists.txt
+++ b/tests/manual/cppgen/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name tst_cppgen)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     SOURCES
         tst_cppgen.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/testCpp/CMakeLists.txt b/tests/manual/testCpp/CMakeLists.txt
index c7875c7..68eeb34 100644
--- a/tests/manual/testCpp/CMakeLists.txt
+++ b/tests/manual/testCpp/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name testCpp)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     SOURCES
         testcpp.cpp
     PUBLIC_LIBRARIES
@@ -14,9 +14,7 @@ qt_add_tool(${target_name}
 )
 
 # Statecharts:
-add_qt_statecharts(testCpp FILES
-    out.scxml
-)
+qt6_add_statecharts(testCpp out.scxml)
 
 #### Keys ignored in scope 1:.:.:testCpp.pro:<TRUE>:
 # OTHER_FILES = "genTestSxcml.py" "out.scxml"
diff --git a/tools/qscxmlc/CMakeLists.txt b/tools/qscxmlc/CMakeLists.txt
index 23dc5d1..f9e6102 100644
--- a/tools/qscxmlc/CMakeLists.txt
+++ b/tools/qscxmlc/CMakeLists.txt
@@ -5,8 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qscxmlc)
-qt_add_tool(${target_name}
-    TOOLS_TARGET Scxml # special case
+qt_internal_add_tool(${target_name}
     SOURCES
         ../../src/scxml/qscxmlcompiler.cpp ../../src/scxml/qscxmlcompiler.h ../../src/scxml/qscxmlcompiler_p.h
         ../../src/scxml/qscxmlerror.cpp ../../src/scxml/qscxmlerror.h
@@ -25,18 +24,14 @@ qt_add_tool(${target_name}
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
-# special case begin
         $<TARGET_PROPERTY:Qt::Scxml,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:Qt::ScxmlPrivate,INTERFACE_INCLUDE_DIRECTORIES>
-# special case end
     LIBRARIES
         Qt::CorePrivate
 )
 
-# special case begin
 set_property(SOURCE ../../src/scxml/qscxmlerror.h PROPERTY SKIP_AUTOMOC ON)
 set_property(SOURCE ../../src/scxml/qscxmlcompiler.cpp PROPERTY SKIP_AUTOMOC ON)
-# special case end
 
 # Resources:
 set(templates_resource_files
@@ -45,12 +40,12 @@ set(templates_resource_files
     "decl.t"
 )
 
-qt_add_resource(${target_name} "templates"
+qt_internal_add_resource(${target_name} "templates"
     PREFIX
         "/"
     FILES
         ${templates_resource_files}
-    OPTIONS --no-compress # special case
+    OPTIONS --no-compress
 )
 
 
diff --git a/tools/qscxmlc/scxmlcppdumper.h b/tools/qscxmlc/scxmlcppdumper.h
index 35849c0..fc8fe76 100644
--- a/tools/qscxmlc/scxmlcppdumper.h
+++ b/tools/qscxmlc/scxmlcppdumper.h
@@ -29,8 +29,7 @@
 #ifndef SCXMLCPPDUMPER_H
 #define SCXMLCPPDUMPER_H
 
-#include "qscxmlglobals.h"
-
+#include <QtScxml/qscxmlglobals.h>
 #include <QtScxml/private/qscxmlcompiler_p.h>
 #include <QtScxml/private/qscxmltabledata_p.h>