summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-07-02 11:56:32 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-07-13 13:22:48 +0200
commit490bf2e97e1990e95fcdfaca625631f48b7d06ca (patch)
treee91c70c0a30ad1d82ca4854de14ebd43b99cfb8e /examples
parentefbd48e60215daa41113ca5942da65fcfb396bbb (diff)
Make server example name more unique
It clashes with other examples in other modules breaking top-builds with examples. Pick-to: 6.2 Change-Id: I5c0b3adfe1e6a81012a96f248b48c43976f2d2ad Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/remoteobjects/CMakeLists.txt2
-rw-r--r--examples/remoteobjects/remoteobjects.pro2
-rw-r--r--examples/remoteobjects/remoteobjects_server/CMakeLists.txt (renamed from examples/remoteobjects/server/CMakeLists.txt)14
-rw-r--r--examples/remoteobjects/remoteobjects_server/main.cpp (renamed from examples/remoteobjects/server/main.cpp)0
-rw-r--r--examples/remoteobjects/remoteobjects_server/remoteobjects_server.pro (renamed from examples/remoteobjects/server/server.pro)2
-rw-r--r--examples/remoteobjects/remoteobjects_server/timemodel.cpp (renamed from examples/remoteobjects/server/timemodel.cpp)0
-rw-r--r--examples/remoteobjects/remoteobjects_server/timemodel.h (renamed from examples/remoteobjects/server/timemodel.h)0
7 files changed, 10 insertions, 10 deletions
diff --git a/examples/remoteobjects/CMakeLists.txt b/examples/remoteobjects/CMakeLists.txt
index ec71f6f..6935496 100644
--- a/examples/remoteobjects/CMakeLists.txt
+++ b/examples/remoteobjects/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from remoteobjects.pro.
-add_subdirectory(server)
+add_subdirectory(remoteobjects_server)
add_subdirectory(cppclient)
add_subdirectory(simpleswitch)
add_subdirectory(websockets)
diff --git a/examples/remoteobjects/remoteobjects.pro b/examples/remoteobjects/remoteobjects.pro
index 9b22d21..096d88b 100644
--- a/examples/remoteobjects/remoteobjects.pro
+++ b/examples/remoteobjects/remoteobjects.pro
@@ -1,7 +1,7 @@
TEMPLATE = subdirs
CONFIG += debug_and_release ordered
SUBDIRS = \
- server \
+ remoteobjects_server \
cppclient \
simpleswitch \
websockets
diff --git a/examples/remoteobjects/server/CMakeLists.txt b/examples/remoteobjects/remoteobjects_server/CMakeLists.txt
index 8962973..c40eacd 100644
--- a/examples/remoteobjects/server/CMakeLists.txt
+++ b/examples/remoteobjects/remoteobjects_server/CMakeLists.txt
@@ -1,7 +1,7 @@
# Generated from server.pro.
cmake_minimum_required(VERSION 3.14)
-project(server LANGUAGES CXX)
+project(remoteobjects_server LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -13,29 +13,29 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
set(INSTALL_EXAMPLESDIR "examples")
endif()
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/server")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/remoteobjects_server")
find_package(Qt6 COMPONENTS RemoteObjects)
find_package(Qt6 COMPONENTS Core)
-qt_add_executable(server
+qt_add_executable(remoteobjects_server
main.cpp
timemodel.cpp timemodel.h
)
-set_target_properties(server PROPERTIES
+set_target_properties(remoteobjects_server PROPERTIES
WIN32_EXECUTABLE FALSE
MACOSX_BUNDLE TRUE
)
-target_link_libraries(server PUBLIC
+target_link_libraries(remoteobjects_server PUBLIC
Qt::Core
Qt::RemoteObjects
)
-qt6_add_repc_sources(server
+qt6_add_repc_sources(remoteobjects_server
../timemodel.rep
)
-install(TARGETS server
+install(TARGETS remoteobjects_server
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/remoteobjects/server/main.cpp b/examples/remoteobjects/remoteobjects_server/main.cpp
index 7eaab06..7eaab06 100644
--- a/examples/remoteobjects/server/main.cpp
+++ b/examples/remoteobjects/remoteobjects_server/main.cpp
diff --git a/examples/remoteobjects/server/server.pro b/examples/remoteobjects/remoteobjects_server/remoteobjects_server.pro
index dc88d28..1c1441d 100644
--- a/examples/remoteobjects/server/server.pro
+++ b/examples/remoteobjects/remoteobjects_server/remoteobjects_server.pro
@@ -9,5 +9,5 @@ HEADERS += timemodel.h
contains(QT_CONFIG, c++11): CONFIG += c++11
-target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/server
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/remoteobjects_server
INSTALLS += target
diff --git a/examples/remoteobjects/server/timemodel.cpp b/examples/remoteobjects/remoteobjects_server/timemodel.cpp
index a444f6e..a444f6e 100644
--- a/examples/remoteobjects/server/timemodel.cpp
+++ b/examples/remoteobjects/remoteobjects_server/timemodel.cpp
diff --git a/examples/remoteobjects/server/timemodel.h b/examples/remoteobjects/remoteobjects_server/timemodel.h
index 09c594a..09c594a 100644
--- a/examples/remoteobjects/server/timemodel.h
+++ b/examples/remoteobjects/remoteobjects_server/timemodel.h