aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2021-06-02 14:21:42 +0200
committerDominik Holland <dominik.holland@qt.io>2021-06-02 17:22:11 +0200
commit1aba8f8a4a2e91d4b3452eb450d864f2acf62f64 (patch)
treee53360ff3329d6b89ac750a94185076f6f3578c7
parent5c8e1fb6c5d3379dd6560fb8d8099821dd26cea3 (diff)
cmake: Adapt to the new QtRemoteObjects cmake API
Change-Id: I8c8bfe242a42f052a53eb4034973f4a5e9c93034 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
-rw-r--r--src/helper/remoteobjects/CMakeLists.txt4
-rw-r--r--src/plugins/ivimedia/media_qtro/CMakeLists.txt2
-rw-r--r--src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl2
-rw-r--r--src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl2
-rw-r--r--src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl2
-rw-r--r--src/tools/media-simulation-server/CMakeLists.txt2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/helper/remoteobjects/CMakeLists.txt b/src/helper/remoteobjects/CMakeLists.txt
index 64a1e2e..9ebcd79 100644
--- a/src/helper/remoteobjects/CMakeLists.txt
+++ b/src/helper/remoteobjects/CMakeLists.txt
@@ -24,10 +24,10 @@ qt_internal_add_module(IviRemoteObjectsHelper
Qt::Qml
Qt::RemoteObjects
)
-qt6_add_repc_source(IviRemoteObjectsHelper
+qt6_add_repc_sources(IviRemoteObjectsHelper
qivipagingmodel.rep
)
-qt6_add_repc_replica(IviRemoteObjectsHelper
+qt6_add_repc_replicas(IviRemoteObjectsHelper
qivipagingmodel.rep
)
diff --git a/src/plugins/ivimedia/media_qtro/CMakeLists.txt b/src/plugins/ivimedia/media_qtro/CMakeLists.txt
index 773ea02..97e003d 100644
--- a/src/plugins/ivimedia/media_qtro/CMakeLists.txt
+++ b/src/plugins/ivimedia/media_qtro/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_internal_add_plugin(MediaQtROPlugin
Qt::RemoteObjects
iviremoteobjects_helper_private
)
-qt6_add_repc_replica(MediaQtROPlugin
+qt6_add_repc_replicas(MediaQtROPlugin
../../../tools/media-simulation-server/qivimediaindexer.rep
../../../tools/media-simulation-server/qivimediaplayer.rep
../../../tools/media-simulation-server/qivisearchandbrowsemodel.rep
diff --git a/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl
index 2308273..df7d86d 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl
@@ -10,7 +10,7 @@ target_sources(${CURRENT_TARGET}
{{module.module_name|lower}}roplugin.cpp
)
-qt6_add_repc_replica(${CURRENT_TARGET}
+qt6_add_repc_replicas(${CURRENT_TARGET}
{% for interface in module.interfaces %}
${CMAKE_CURRENT_BINARY_DIR}/{{interface|lower}}.rep
{% endfor %}
diff --git a/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl
index 151d979..274202e 100644
--- a/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl
@@ -7,7 +7,7 @@ target_sources(${CURRENT_TARGET}
core.cpp
)
-qt6_add_repc_source(${CURRENT_TARGET}
+qt6_add_repc_sources(${CURRENT_TARGET}
{% for interface in module.interfaces %}
${CMAKE_CURRENT_BINARY_DIR}/{{interface|lower}}.rep
{% endfor %}
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 d48f2b8..1925e1b 100644
--- a/src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl
@@ -20,7 +20,7 @@ target_sources(${CURRENT_TARGET}
${${CURRENT_TARGET}_SOURCES}
)
-qt6_add_repc_source(${CURRENT_TARGET}
+qt6_add_repc_sources(${CURRENT_TARGET}
{% for interface in module.interfaces %}
${CMAKE_CURRENT_BINARY_DIR}/{{interface|lower}}.rep
{% endfor %}
diff --git a/src/tools/media-simulation-server/CMakeLists.txt b/src/tools/media-simulation-server/CMakeLists.txt
index d6fce2c..2dbf168 100644
--- a/src/tools/media-simulation-server/CMakeLists.txt
+++ b/src/tools/media-simulation-server/CMakeLists.txt
@@ -32,7 +32,7 @@ qt_add_tool(${target_name}
WrapTagLib::WrapTagLib
iviremoteobjects_helper_private
)
-qt6_add_repc_source(ivimedia-simulation-server
+qt6_add_repc_sources(ivimedia-simulation-server
qivimediaindexer.rep
qivimediaplayer.rep
qivimediadiscoverymodel.rep