Enable the QtRemoteObjects support

Similar to the previous commits, the examples and tests build ok, but
are not yet ready to be used and still need to be refactored.

Change-Id: Icb4482696e81a5a17b89622182053c5cfcb5fc7b
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

42 files changed, 182 insertions, 342 deletions

diff --git a/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt
index f5bda9e..90ec5d8 100644
--- a/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt
+++ b/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt
@@ -35,7 +35,7 @@ target_include_directories(example_ivi_remote PUBLIC
 )
 
 target_link_libraries(example_ivi_remote PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+    QtIviRemoteExample
     Qt::Core
     Qt::Gui
     Qt::IviCore
diff --git a/examples/ivicore/qface-ivi-remote/demo/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/demo/CMakeLists.txt
index e591f9b..09de96e 100644
--- a/examples/ivicore/qface-ivi-remote/demo/CMakeLists.txt
+++ b/examples/ivicore/qface-ivi-remote/demo/CMakeLists.txt
@@ -36,7 +36,7 @@ target_compile_definitions(qface-ivi-remote PUBLIC
 )
 
 target_link_libraries(qface-ivi-remote PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+    QtIviRemoteExample
     Qt::Core
     Qt::Gui
     Qt::Qml
diff --git a/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt
index c219e21..1fb9b77 100644
--- a/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package(Qt6 COMPONENTS IviCore)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
 
-qt_add_executable(QtIviRemoteExample)
+add_library(QtIviRemoteExample)
 
 # IVI Generator:
 qt6_ivigenerator(QtIviRemoteExample
diff --git a/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt
index 6b2110d..6b29361 100644
--- a/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt
+++ b/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt
@@ -40,7 +40,7 @@ target_compile_definitions(qface-ivi-remote-server PUBLIC
 )
 
 target_link_libraries(qface-ivi-remote-server PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+    QtIviRemoteExample
     Qt::Core
 )
 
diff --git a/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt
index 8457644..37afc5e 100644
--- a/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
 
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter1)
 
 # IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter1
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT frontend
 )
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter1 PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter1 PUBLIC
     QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
 )
 
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter1 PUBLIC
     Qt::Core
     Qt::Gui
     Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
     Qt::Quick
 )
 
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter1
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/CMakeLists.txt
index 3c3e845..f1b9eba 100644
--- a/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/CMakeLists.txt
@@ -32,7 +32,7 @@ target_include_directories(chapter1-basics PUBLIC
 )
 
 target_link_libraries(chapter1-basics PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+    QtIviInstrumentCluster_Chapter1
     Qt::Core
     Qt::Gui
     Qt::Qml
diff --git a/examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt
index e9d0815..39ff7a5 100644
--- a/examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
 
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter2)
 
 # IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter2
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT frontend
 )
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter2 PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter2 PUBLIC
     QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
 )
 
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter2 PUBLIC
     Qt::Core
     Qt::Gui
     Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
     Qt::Quick
 )
 
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter2
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/CMakeLists.txt
index 154a9aa..40ea623 100644
--- a/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/CMakeLists.txt
@@ -32,7 +32,7 @@ target_include_directories(chapter2-enums-structs PUBLIC
 )
 
 target_link_libraries(chapter2-enums-structs PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+    QtIviInstrumentCluster_Chapter2
     Qt::Core
     Qt::Gui
     Qt::Qml
diff --git a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt
index ce270e6..8729060 100644
--- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt
@@ -19,29 +19,29 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS IviCore)
 
-qt_add_plugin(instrumentcluster_simulation)
+qt_add_plugin(instrumentcluster_chapter3_simulation)
 
 # IVI Generator:
-qt6_ivigenerator(instrumentcluster_simulation
+qt6_ivigenerator(instrumentcluster_chapter3_simulation
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT backend_simulator
 )
-set_target_properties(instrumentcluster_simulation PROPERTIES
+set_target_properties(instrumentcluster_chapter3_simulation PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_include_directories(instrumentcluster_simulation PUBLIC
+target_include_directories(instrumentcluster_chapter3_simulation PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}/../frontend
 )
 
-target_link_libraries(instrumentcluster_simulation PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrumentcluster_chapter3_simulation PUBLIC
+    QtIviInstrumentCluster_Chapter3
     Qt::Core
     Qt::Gui
     Qt::IviCore
 )
 
-install(TARGETS instrumentcluster_simulation
+install(TARGETS instrumentcluster_chapter3_simulation
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt
index 773b357..0d33a7e 100644
--- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
 
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter3)
 
 # IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter3
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT frontend
 )
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter3 PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter3 PUBLIC
     QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
 )
 
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter3 PUBLIC
     Qt::Core
     Qt::Gui
     Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
     Qt::Quick
 )
 
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter3
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
index 3c35fa0..9232454 100644
--- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
@@ -21,26 +21,26 @@ find_package(Qt6 COMPONENTS IviCore)
 
 
 # IVI Generator:
-qt6_ivigenerator(instrument_cluster_imports # special case
+qt6_ivigenerator(instrument_cluster_chapter3_imports # special case
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT qmlplugin
 )
-set_target_properties(instrument_cluster_imports PROPERTIES # special case
+set_target_properties(instrument_cluster_chapter3_imports PROPERTIES # special case
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_include_directories(instrument_cluster_imports PUBLIC # special case
+target_include_directories(instrument_cluster_chapter3_imports PUBLIC # special case
     ${CMAKE_CURRENT_BINARY_DIR}/../frontend
 )
 
-target_link_libraries(instrument_cluster_imports PUBLIC # special case
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrument_cluster_chapter3_imports PUBLIC # special case
+    QtIviInstrumentCluster_Chapter3
     Qt::Core
     Qt::Gui
     Qt::IviCore
 )
 
-install(TARGETS instrument_cluster_imports # special case
+install(TARGETS instrument_cluster_chapter3_imports # special case
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
index d05a645..628722a 100644
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
@@ -19,23 +19,23 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS IviCore)
 
-qt_add_plugin(instrumentcluster_simulation)
+qt_add_plugin(instrumentcluster_chapter4_simulation)
 
 # IVI Generator:
-qt6_ivigenerator(instrumentcluster_simulation
+qt6_ivigenerator(instrumentcluster_chapter4_simulation
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT backend_simulator
 )
-set_target_properties(instrumentcluster_simulation PROPERTIES
+set_target_properties(instrumentcluster_chapter4_simulation PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_include_directories(instrumentcluster_simulation PUBLIC
+target_include_directories(instrumentcluster_chapter4_simulation PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}/../frontend
 )
 
-target_link_libraries(instrumentcluster_simulation PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrumentcluster_chapter4_simulation PUBLIC
+    QtIviInstrumentCluster_Chapter4
     Qt::Core
     Qt::Gui
     Qt::IviCore
@@ -47,14 +47,14 @@ set(simulation_resource_files
     "simulation.qml"
 )
 
-qt6_add_resources(instrumentcluster_simulation "simulation"
+qt6_add_resources(instrumentcluster_chapter4_simulation "simulation"
     PREFIX
         "/"
     FILES
         ${simulation_resource_files}
 )
 
-install(TARGETS instrumentcluster_simulation
+install(TARGETS instrumentcluster_chapter4_simulation
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
index 92b465b..9f4e36a 100644
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
 
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter4)
 
 # IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter4
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT frontend
 )
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter4 PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter4 PUBLIC
     QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
 )
 
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter4 PUBLIC
     Qt::Core
     Qt::Gui
     Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
     Qt::Quick
 )
 
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter4
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
index b55a4e8..8a99af1 100644
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
@@ -21,26 +21,26 @@ find_package(Qt6 COMPONENTS IviCore)
 
 
 # IVI Generator:
-qt6_ivigenerator(instrument_cluster_imports # special case
+qt6_ivigenerator(instrument_cluster_chapter4_imports # special case
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT qmlplugin
 )
-set_target_properties(instrument_cluster_imports PROPERTIES # special case
+set_target_properties(instrument_cluster_chapter4_imports PROPERTIES # special case
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_include_directories(instrument_cluster_imports PUBLIC # special case
+target_include_directories(instrument_cluster_chapter4_imports PUBLIC # special case
     ${CMAKE_CURRENT_BINARY_DIR}/../frontend
 )
 
-target_link_libraries(instrument_cluster_imports PUBLIC # special case
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrument_cluster_chapter4_imports PUBLIC # special case
+    QtIviInstrumentCluster_Chapter4
     Qt::Core
     Qt::Gui
     Qt::IviCore
 )
 
-install(TARGETS instrument_cluster_imports # special case
+install(TARGETS instrument_cluster_chapter4_imports # special case
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt
index 6171192..fbf027a 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt
@@ -35,7 +35,7 @@ target_include_directories(instrumentcluster_qtro PUBLIC
 )
 
 target_link_libraries(instrumentcluster_qtro PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+    QtIviInstrumentCluster_Chapter5
     Qt::Core
     Qt::Gui
     Qt::IviCore
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt
index 6db7b24..c27a530 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt
@@ -19,23 +19,23 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS IviCore)
 
-qt_add_plugin(instrumentcluster_simulation)
+qt_add_plugin(instrumentcluster_chapter5_simulation)
 
 # IVI Generator:
-qt6_ivigenerator(instrumentcluster_simulation
+qt6_ivigenerator(instrumentcluster_chapter5_simulation
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT backend_simulator
 )
-set_target_properties(instrumentcluster_simulation PROPERTIES
+set_target_properties(instrumentcluster_chapter5_simulation PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_include_directories(instrumentcluster_simulation PUBLIC
+target_include_directories(instrumentcluster_chapter5_simulation PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}/../frontend
 )
 
-target_link_libraries(instrumentcluster_simulation PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrumentcluster_chapter5_simulation PUBLIC
+    QtIviInstrumentCluster_Chapter5
     Qt::Core
     Qt::Gui
     Qt::IviCore
@@ -47,14 +47,14 @@ set(simulation_resource_files
     "simulation.qml"
 )
 
-qt6_add_resources(instrumentcluster_simulation "simulation"
+qt6_add_resources(instrumentcluster_chapter5_simulation "simulation"
     PREFIX
         "/"
     FILES
         ${simulation_resource_files}
 )
 
-install(TARGETS instrumentcluster_simulation
+install(TARGETS instrumentcluster_chapter5_simulation
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt
index 0927186..9be3458 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
 
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter5)
 
 # IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter5
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT frontend
 )
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter5 PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter5 PUBLIC
     QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
 )
 
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter5 PUBLIC
     Qt::Core
     Qt::Gui
     Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
     Qt::Quick
 )
 
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter5
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
index 768b549..2e43fb2 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
@@ -21,26 +21,26 @@ find_package(Qt6 COMPONENTS IviCore)
 
 
 # IVI Generator:
-qt6_ivigenerator(imports
+qt6_ivigenerator(instrument_cluster_chapter5_imports
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT qmlplugin
 )
-set_target_properties(imports PROPERTIES
+set_target_properties(instrument_cluster_chapter5_imports PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_include_directories(imports PUBLIC
+target_include_directories(instrument_cluster_chapter5_imports PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}/../frontend
 )
 
-target_link_libraries(imports PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrument_cluster_chapter5_imports PUBLIC
+    QtIviInstrumentCluster_Chapter5
     Qt::Core
     Qt::Gui
     Qt::IviCore
 )
 
-install(TARGETS imports
+install(TARGETS instrument_cluster_chapter5_imports
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt
index 15105dc..e92b615 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt
@@ -34,8 +34,7 @@ target_include_directories(chapter5-ipc-server PUBLIC
 )
 
 target_link_libraries(chapter5-ipc-server PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
-    # Remove: gui
+    QtIviInstrumentCluster_Chapter5
     Qt::Core
     Qt::IviCore
 )
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/CMakeLists.txt
index e2b197c..1bf264a 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/CMakeLists.txt
@@ -36,7 +36,7 @@ target_include_directories(instrumentcluster_dbus PUBLIC
 )
 
 target_link_libraries(instrumentcluster_dbus PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+    QtIviInstrumentCluster_Chapter6
     Qt::Core
     Qt::DBus
     Qt::Gui
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt
index e3227a0..34bba3b 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt
@@ -35,7 +35,7 @@ target_include_directories(instrumentcluster_simulation PUBLIC
 )
 
 target_link_libraries(instrumentcluster_simulation PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+    QtIviInstrumentCluster_Chapter6
     Qt::Core
     Qt::Gui
     Qt::IviCore
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt
index 2b0fc93..4654fff 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
 
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter6)
 
 # IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter6
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT frontend
 )
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter6 PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter6 PUBLIC
     QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
 )
 
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter6 PUBLIC
     Qt::Core
     Qt::Gui
     Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
     Qt::Quick
 )
 
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter6
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
index 9723bd9..fe95de7 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from imports.pro.
 
 cmake_minimum_required(VERSION 3.14)
-project(imports LANGUAGES CXX)
+project(instrument_cluster_chapter6_imports LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -21,26 +21,26 @@ find_package(Qt6 COMPONENTS IviCore)
 
 
 # IVI Generator:
-qt6_ivigenerator(imports
+qt6_ivigenerator(instrument_cluster_chapter6_imports
     QFACE_SOURCES ../instrument-cluster.qface
     QFACE_FORMAT qmlplugin
 )
-set_target_properties(imports PROPERTIES
+set_target_properties(instrument_cluster_chapter6_imports PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_include_directories(imports PUBLIC
+target_include_directories(instrument_cluster_chapter6_imports PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}/../frontend
 )
 
-target_link_libraries(imports PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrument_cluster_chapter6_imports PUBLIC
+    QtIviInstrumentCluster_Chapter6
     Qt::Core
     Qt::Gui
     Qt::IviCore
 )
 
-install(TARGETS imports
+install(TARGETS instrument_cluster_chapter6_imports
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/src/helper/remoteobjects/CMakeLists.txt b/src/helper/remoteobjects/CMakeLists.txt
index 3a095e9..142e759 100644
--- a/src/helper/remoteobjects/CMakeLists.txt
+++ b/src/helper/remoteobjects/CMakeLists.txt
@@ -4,6 +4,12 @@
 ## IviRemoteObjectsHelper Module:
 #####################################################################
 
+# FIXME Find a way to enable this again
+# The generated remoteobjects headers are part of this internal module
+# This is a problem as the headersclean target checks the headers before
+# building the module and at that time the rep headers are not created yet
+set(QT_FEATURE_headersclean FALSE)
+
 qt_add_module(IviRemoteObjectsHelper
     CONFIG_MODULE_NAME iviremoteobjects_helper
     STATIC
@@ -22,7 +28,7 @@ qt6_add_repc_source(IviRemoteObjectsHelper
     qivipagingmodel.rep
 )
 qt6_add_repc_replica(IviRemoteObjectsHelper
-        qivipagingmodel.rep
+    qivipagingmodel.rep
 )
 
 #### Keys ignored in scope 1:.:.:remoteobjects.pro:<TRUE>:
diff --git a/src/helper/remoteobjects/qivipagingmodelqtroadapter.h b/src/helper/remoteobjects/qivipagingmodelqtroadapter.h
index 9bd9a75..a7dc203 100644
--- a/src/helper/remoteobjects/qivipagingmodelqtroadapter.h
+++ b/src/helper/remoteobjects/qivipagingmodelqtroadapter.h
@@ -43,7 +43,7 @@
 #define QIVIPAGINGMODELQTROADAPTER_H
 
 #include <QtIviCore/QIviPagingModelInterface>
-#include <rep_qivipagingmodel_source.h>
+#include "rep_qivipagingmodel_source.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/helper/remoteobjects/qiviremoteobjectpendingresult.h b/src/helper/remoteobjects/qiviremoteobjectpendingresult.h
index d1fa92e..a9bdbb8 100644
--- a/src/helper/remoteobjects/qiviremoteobjectpendingresult.h
+++ b/src/helper/remoteobjects/qiviremoteobjectpendingresult.h
@@ -73,7 +73,7 @@ private:
 //POD, passing by value should be fine
 inline bool operator==(QIviRemoteObjectPendingResult left, QIviRemoteObjectPendingResult right) Q_DECL_NOTHROW {
     return left.id() == right.id() && left.failed() == right.failed();
-};;
+}
 inline bool operator!=(QIviRemoteObjectPendingResult left, QIviRemoteObjectPendingResult right) Q_DECL_NOTHROW {
     return !(left == right);
 }
diff --git a/src/helper/remoteobjects/qiviremoteobjectsourcehelper.h b/src/helper/remoteobjects/qiviremoteobjectsourcehelper.h
index b60c9ac..80e7d5a 100644
--- a/src/helper/remoteobjects/qiviremoteobjectsourcehelper.h
+++ b/src/helper/remoteobjects/qiviremoteobjectsourcehelper.h
@@ -66,7 +66,7 @@ public:
         // work for methods/signals which take a QVariant.
         // The workaround is put the QVariant in a QVariant as a container.
         // QTBUG-75056
-        return QVariant(QMetaType::QVariant, &variant);
+        return QVariant(QMetaType(QMetaType::QVariant), &variant);
     }
 
     QVariant fromPendingReply(const QIviPendingReplyBase &pendingReply)
diff --git a/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl
index f72276c..e1fbcd2 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl
@@ -1,4 +1,6 @@
-find_package(Qt6 COMPONENTS RemoteObjects IviRemoteObjectsHelper)
+if (NOT TARGET Qt6::RemoteObjects OR NOT TARGET Qt6::IviRemoteObjectsHelper)
+    find_package(Qt6 COMPONENTS RemoteObjects IviRemoteObjectsHelper)
+endif()
 
 target_sources(${CURRENT_TARGET}
                PRIVATE
@@ -8,12 +10,17 @@ target_sources(${CURRENT_TARGET}
     {{module.module_name|lower}}qtroplugin.cpp
 )
 
-qt_add_repc_replica(${CURRENT_TARGET}
+qt6_add_repc_replica(${CURRENT_TARGET}
 {% for interface in module.interfaces %}
-    {{interface|lower}}.rep
+    ${CMAKE_CURRENT_BINARY_DIR}/{{interface|lower}}.rep
 {% endfor %}
 )
 
+target_link_libraries(${CURRENT_TARGET} PRIVATE
+    Qt6::RemoteObjects
+    Qt6::IviRemoteObjectsHelper
+)
+
 ### MISSING
 # OTHER_FILES += \
 #    $$PWD/{{module.module_name|lower}}.json
diff --git a/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl
index b9e7558..69be2a2 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl
@@ -47,8 +47,8 @@ Q_LOGGING_CATEGORY(qLcRO{{interface}}{{property|upper_first}}, "{{module|qml_typ
 
 {{class}}::{{class}}(const QString &remoteObjectsLookupName, QObject* parent)
     : QIviPagingModelInterface(parent)
-    , m_node(nullptr)
     , m_helper(new QIviRemoteObjectReplicaHelper(qLcRO{{interface}}{{property|upper_first}}(), this))
+    , m_node(nullptr)
     , m_remoteObjectsLookupName(remoteObjectsLookupName)
 {
     qRegisterMetaType<QIviPagingModelInterface*>();
diff --git a/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl
index 843a3f4..93cad4a 100644
--- a/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl
+++ b/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl
@@ -1,5 +1,4 @@
-target_sources(${CURRENT_TARGET}
-               PRIVATE
+set(${CURRENT_TARGET}_SOURCES
 {% for interface in module.interfaces %}
     {{interface|lower}}backend.cpp
 {% endfor %}
@@ -7,6 +6,15 @@ target_sources(${CURRENT_TARGET}
     {{module.module_name|lower}}_simulation.qrc
 )
 
+qt_add_resources(${CURRENT_TARGET}_SOURCES
+    ${CMAKE_CURRENT_BINARY_DIR}/{{module.module_name|lower}}_simulation.qrc
+)
+
+target_sources(${CURRENT_TARGET}
+    PRIVATE
+    ${${CURRENT_TARGET}_SOURCES}
+)
+
 ### MISSING
 # OTHER_FILES += \
 #    $$PWD/{{module.module_name|lower}}.json \
diff --git a/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl
index 963d7aa..151d979 100644
--- a/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl
@@ -1,13 +1,19 @@
-find_package(Qt6 COMPONENTS RemoteObjects)
+if (NOT TARGET Qt6::RemoteObjects OR NOT TARGET Qt6::IviRemoteObjectsHelper)
+    find_package(Qt6 COMPONENTS RemoteObjects IviRemoteObjectsHelper)
+endif()
 
 target_sources(${CURRENT_TARGET}
                PRIVATE
     core.cpp
 )
 
-qt_add_repc_source(${CURRENT_TARGET}
+qt6_add_repc_source(${CURRENT_TARGET}
 {% for interface in module.interfaces %}
-    {{interface|lower}}.rep
+    ${CMAKE_CURRENT_BINARY_DIR}/{{interface|lower}}.rep
 {% endfor %}
 )
 
+target_link_libraries(${CURRENT_TARGET} PRIVATE
+    Qt6::RemoteObjects
+    Qt6::IviRemoteObjectsHelper
+)
diff --git a/src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl
index 7398ad1..d48f2b8 100644
--- a/src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl
@@ -1,22 +1,36 @@
-find_package(Qt6 COMPONENTS RemoteObjects IviRemoteObjectsHelper)
+if (NOT TARGET Qt6::RemoteObjects OR NOT TARGET Qt6::IviRemoteObjectsHelper)
+    find_package(Qt6 COMPONENTS RemoteObjects IviRemoteObjectsHelper)
+endif()
 
-target_sources(${CURRENT_TARGET}
-               PRIVATE
+set(${CURRENT_TARGET}_SOURCES
 {% for interface in module.interfaces %}
     {{interface|lower}}backend.cpp
     {{interface|lower}}adapter.cpp
 {% endfor %}
     core.cpp
     main.cpp
-    {{module.module_name|lower}}_simulation.qrc
 )
 
-qt_add_repc_source(${CURRENT_TARGET}
+qt_add_resources(${CURRENT_TARGET}_SOURCES
+    ${CMAKE_CURRENT_BINARY_DIR}/{{module.module_name|lower}}_simulation.qrc
+)
+
+target_sources(${CURRENT_TARGET}
+    PRIVATE
+    ${${CURRENT_TARGET}_SOURCES}
+)
+
+qt6_add_repc_source(${CURRENT_TARGET}
 {% for interface in module.interfaces %}
-    {{interface|lower}}.rep
+    ${CMAKE_CURRENT_BINARY_DIR}/{{interface|lower}}.rep
 {% endfor %}
 )
 
+target_link_libraries(${CURRENT_TARGET} PRIVATE
+    Qt6::RemoteObjects
+    Qt6::IviRemoteObjectsHelper
+)
+
 ### MISSING
 # OTHER_FILES += \
 #    $$PWD/{{module.module_name|lower}}.json \
diff --git a/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt b/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt
index 549def5..8a091b3 100644
--- a/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt
+++ b/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt
@@ -5,11 +5,14 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name ivivehiclefunctions-simulation-server)
-qt_add_tool(${target_name}
-    PUBLIC_LIBRARIES
-        # Remove: gui
+qt_internal_add_tool(${target_name}
+     TOOLS_TARGET IviVehicleFunctions
+     LIBRARIES
         Qt::IviCore
-        ivivehiclefunctions
+        Qt::IviVehicleFunctions
+     PUBLIC_LIBRARIES
+        Qt::IviCore
+        Qt::IviVehicleFunctions
 )
 
 # Resources:
@@ -35,7 +38,7 @@ qt_add_resource(${target_name} "qml"
 
 
 # IVI Generator:
-qt_ivigenerator(ivivehiclefunctions-simulation-server
+qt_ivigenerator(${target_name}
     QFACE_SOURCES ../../ivivehiclefunctions/ivivehiclefunctions.qface
     QFACE_FORMAT server_qtro_simulator
     QFACE_MODULE_NAME QtIviVehicleFunctions
diff --git a/tests/auto/core/ivigenerator/projects/include-test/backend_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/backend_qtro/CMakeLists.txt
index e770318..98d9cc4 100644
--- a/tests/auto/core/ivigenerator/projects/include-test/backend_qtro/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/include-test/backend_qtro/CMakeLists.txt
@@ -1,20 +1,10 @@
 # Generated from backend_qtro.pro.
-
-cmake_minimum_required(VERSION 3.14)
-project(include_test_qtro LANGUAGES CXX)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
-
 qt_add_plugin(include_test_qtro)
 
 # IVI Generator:
@@ -23,25 +13,10 @@ qt6_ivigenerator(include_test_qtro
     QFACE_FORMAT backend_qtro
     QFACE_IMPORT_PATH ../../../qface\ imports
 )
-set_target_properties(include_test_qtro PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
-target_include_directories(include_test_qtro PUBLIC
-    ${CMAKE_CURRENT_BINARY_DIR}/../common
-    ${CMAKE_CURRENT_BINARY_DIR}/../frontend
-)
 
 target_link_libraries(include_test_qtro PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/..
     include_test_frontend
     Qt::Core
     Qt::Gui
     Qt::IviCore
 )
-
-install(TARGETS include_test_qtro
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/tests/auto/core/ivigenerator/projects/include-test/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/simulation_server_qtro/CMakeLists.txt
index 404f963..ef4cccc 100644
--- a/tests/auto/core/ivigenerator/projects/include-test/simulation_server_qtro/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/include-test/simulation_server_qtro/CMakeLists.txt
@@ -1,48 +1,25 @@
 # Generated from simulation_server_qtro.pro.
-
-cmake_minimum_required(VERSION 3.14)
-project(org-example-echo-qtro-simulation-server LANGUAGES CXX)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
-
-qt_add_executable(org-example-echo-qtro-simulation-server)
+qt_add_executable(include-test-simulation-server)
 
 # IVI Generator:
-qt6_ivigenerator(org-example-echo-qtro-simulation-server
+qt6_ivigenerator(include-test-simulation-server
     QFACE_SOURCES ../../../include-test.qface
     QFACE_FORMAT server_qtro_simulator
     QFACE_IMPORT_PATH ../../../qface\ imports
 )
-set_target_properties(org-example-echo-qtro-simulation-server PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE FALSE
-)
-target_include_directories(org-example-echo-qtro-simulation-server PUBLIC
-    ${CMAKE_CURRENT_BINARY_DIR}/../common
-    ${CMAKE_CURRENT_BINARY_DIR}/../frontend
-)
 
-target_link_libraries(org-example-echo-qtro-simulation-server PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/..
+target_link_libraries(include-test-simulation-server PUBLIC
+    include_test_common
+    include_test_frontend
     Qt::Core
     Qt::Gui
     Qt::IviCore
     Qt::Qml
     Qt::Quick
 )
-
-install(TARGETS org-example-echo-qtro-simulation-server
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt
index b7481c9..4fe728c 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt
@@ -1,45 +1,21 @@
 # Generated from backend_qtro.pro.
-
-cmake_minimum_required(VERSION 3.14)
-project(echo_noannotation_qtro LANGUAGES CXX)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
-
-qt_add_plugin(echo_noannotation_qtro)
+qt_add_plugin(echo_noanno_qtro)
 
 # IVI Generator:
-qt6_ivigenerator(echo_noannotation_qtro
+qt6_ivigenerator(echo_noanno_qtro
     QFACE_SOURCES ../../../org.example.echo.noannotation.qface
     QFACE_FORMAT backend_qtro
 )
-set_target_properties(echo_noannotation_qtro PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
-target_include_directories(echo_noannotation_qtro PUBLIC
-    ${CMAKE_CURRENT_BINARY_DIR}/../frontend
-)
 
-target_link_libraries(echo_noannotation_qtro PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/..
-    echo_noannotation_frontend
+target_link_libraries(echo_noanno_qtro PUBLIC
+    echo_noanno_frontend
     Qt::Core
     Qt::Gui
     Qt::IviCore
 )
-
-install(TARGETS echo_noannotation_qtro
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt
index 1f41012..8969c26 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt
@@ -1,46 +1,23 @@
 # Generated from simulation_server_qtro.pro.
-
-cmake_minimum_required(VERSION 3.14)
-project(org-example-echo-noannotation-simulation-server LANGUAGES CXX)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
-
-qt_add_executable(org-example-echo-noannotation-simulation-server)
+qt_add_executable(org-example-echo-noanno-simulation-server)
 
 # IVI Generator:
-qt6_ivigenerator(org-example-echo-noannotation-simulation-server
+qt6_ivigenerator(org-example-echo-noanno-simulation-server
     QFACE_SOURCES ../../../org.example.echo.noannotation.qface
     QFACE_FORMAT server_qtro_simulator
 )
-set_target_properties(org-example-echo-noannotation-simulation-server PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE FALSE
-)
-target_include_directories(org-example-echo-noannotation-simulation-server PUBLIC
-    ${CMAKE_CURRENT_BINARY_DIR}/../frontend
-)
 
-target_link_libraries(org-example-echo-noannotation-simulation-server PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/..
+target_link_libraries(org-example-echo-noanno-simulation-server PUBLIC
+    echo_noanno_frontend
     Qt::Core
     Qt::Gui
     Qt::IviCore
     Qt::Qml
     Qt::Quick
 )
-
-install(TARGETS org-example-echo-noannotation-simulation-server
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt
index 2cd08aa..604d87c 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt
@@ -12,10 +12,6 @@ qt6_ivigenerator(tst_org-example-echo-noanno
     QFACE_SOURCES ../../../org.example.echo.noannotation.qface
     QFACE_FORMAT test
 )
-set_target_properties(tst_org-example-echo-noanno PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
 
 target_link_libraries(tst_org-example-echo-noanno PUBLIC
     echo_noanno_frontend
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt
index e674c29..aaac430 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt
@@ -1,24 +1,10 @@
 # Generated from backend_qtro.pro.
-
-cmake_minimum_required(VERSION 3.14)
-project(echo_backend_qtro LANGUAGES CXX)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
-
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS IviCore)
-
 qt_add_plugin(echo_backend_qtro)
 
 # IVI Generator:
@@ -26,13 +12,6 @@ qt6_ivigenerator(echo_backend_qtro
     QFACE_SOURCES ../../../org.example.echo.qface
     QFACE_FORMAT backend_qtro
 )
-set_target_properties(echo_backend_qtro PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
-target_include_directories(echo_backend_qtro PUBLIC
-    ${CMAKE_CURRENT_BINARY_DIR}/../frontend
-)
 
 target_link_libraries(echo_backend_qtro PUBLIC
     # Remove: L${CMAKE_CURRENT_BINARY_DIR}/..
@@ -41,9 +20,3 @@ target_link_libraries(echo_backend_qtro PUBLIC
     Qt::Gui
     Qt::IviCore
 )
-
-install(TARGETS echo_backend_qtro
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt
index 73294cc..d55b1f2 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt
@@ -1,35 +1,22 @@
 # Generated from frontend.pro.
-
-cmake_minimum_required(VERSION 3.14)
-project(echo_qtro_frontend LANGUAGES CXX)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
-
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS IviCore)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS Quick)
-
-qt_add_executable(echo_qtro_frontend)
+add_library(echo_qtro_frontend)
 
 # IVI Generator:
 qt6_ivigenerator(echo_qtro_frontend
     QFACE_SOURCES ../../../org.example.echo.qface
     QFACE_FORMAT frontend
 )
+target_include_directories(echo_qtro_frontend PUBLIC
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
 
-target_link_libraries(echo_frontend PUBLIC
+target_link_libraries(echo_qtro_frontend PUBLIC
     Qt::Core
     Qt::Gui
     Qt::IviCore
@@ -37,9 +24,3 @@ target_link_libraries(echo_frontend PUBLIC
     Qt::Qml
     Qt::Quick
 )
-
-install(TARGETS echo_frontend
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt
index 4983874..e248ff3 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt
@@ -1,25 +1,12 @@
 # Generated from server_qtro_test.pro.
-
-cmake_minimum_required(VERSION 3.14)
-project(tst_org-example-echo-qtro LANGUAGES CXX)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
-
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Test)
-find_package(Qt6 COMPONENTS IviCore)
-
 qt_add_executable(tst_org-example-echo-qtro
+    SOURCES
     contactsmodelservice.cpp contactsmodelservice.h
     echoservice.cpp echoservice.h
     echozonedservice.cpp echozonedservice.h
@@ -33,26 +20,11 @@ qt6_ivigenerator(tst_org-example-echo-qtro
     QFACE_SOURCES ../../../org.example.echo.qface
     QFACE_FORMAT server_qtro
 )
-set_target_properties(tst_org-example-echo-qtro PROPERTIES
-    WIN32_EXECUTABLE FALSE
-    MACOSX_BUNDLE FALSE
-)
-target_include_directories(tst_org-example-echo-qtro PUBLIC
-    ${CMAKE_CURRENT_BINARY_DIR}/../backend_qtro
-    ${CMAKE_CURRENT_BINARY_DIR}/../frontend
-)
 
 target_link_libraries(tst_org-example-echo-qtro PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/..
     echo_qtro_frontend
     Qt::Core
     Qt::IviCore
     Qt::Test
-    iviremoteobjects_helper_private
-)
-
-install(TARGETS tst_org-example-echo-qtro
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+    Qt::IviRemoteObjectsHelper
 )
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt
index 4c02b19..60577ed 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt
@@ -1,26 +1,10 @@
 # Generated from simulation_server_qtro.pro.
-
-cmake_minimum_required(VERSION 3.14)
-project(org-example-echo-qtro-simulation-server LANGUAGES CXX)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
-
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS IviCore)
-
 qt_add_executable(org-example-echo-qtro-simulation-server)
 
 # IVI Generator:
@@ -28,16 +12,8 @@ qt6_ivigenerator(org-example-echo-qtro-simulation-server
     QFACE_SOURCES ../../../org.example.echo.qface
     QFACE_FORMAT server_qtro_simulator
 )
-set_target_properties(org-example-echo-qtro-simulation-server PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE FALSE
-)
-target_include_directories(org-example-echo-qtro-simulation-server PUBLIC
-    ${CMAKE_CURRENT_BINARY_DIR}/../frontend
-)
 
 target_link_libraries(org-example-echo-qtro-simulation-server PUBLIC
-    # Remove: L${CMAKE_CURRENT_BINARY_DIR}/..
     echo_qtro_frontend
     Qt::Core
     Qt::Gui
@@ -45,9 +21,3 @@ target_link_libraries(org-example-echo-qtro-simulation-server PUBLIC
     Qt::Qml
     Qt::Quick
 )
-
-install(TARGETS org-example-echo-qtro-simulation-server
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)