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>

9 files changed, 20 insertions, 223 deletions

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}"
-)