summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <[email protected]>2025-05-21 14:56:30 +0200
committerLiang Qi <[email protected]>2025-05-27 15:38:58 +0200
commit80225f077166b7a1d20145b2b153f2f6184d513c (patch)
treefb7d283d219df14f7cc363d0d49ca653aec907e5
parent64c2c5c0bd34f384792b0603aa611a14dd62d050 (diff)
tests: rename SharedClientTest to SharedWaylandClientTestHEADdev
avoid name crash with SharedClientTest in qtbase. Change-Id: I25b109b49ca9802fa1fcd68d9296a7dc90e99db2 Reviewed-by: David Edmundson <[email protected]>
-rw-r--r--tests/auto/client/iviapplication/CMakeLists.txt2
-rw-r--r--tests/auto/client/shared/CMakeLists.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/client/iviapplication/CMakeLists.txt b/tests/auto/client/iviapplication/CMakeLists.txt
index a138d3429..26a95fb2c 100644
--- a/tests/auto/client/iviapplication/CMakeLists.txt
+++ b/tests/auto/client/iviapplication/CMakeLists.txt
@@ -11,5 +11,5 @@ qt_internal_add_test(tst_client_iviapplication
SOURCES
tst_iviapplication.cpp
LIBRARIES
- SharedClientTest
+ SharedWaylandClientTest
)
diff --git a/tests/auto/client/shared/CMakeLists.txt b/tests/auto/client/shared/CMakeLists.txt
index ca2b4098c..ff0f077a4 100644
--- a/tests/auto/client/shared/CMakeLists.txt
+++ b/tests/auto/client/shared/CMakeLists.txt
@@ -25,7 +25,7 @@ qt_manual_moc(moc_files
xdgshell.h
)
-add_library(SharedClientTest
+add_library(SharedWaylandClientTest
OBJECT
corecompositor.cpp corecompositor.h
coreprotocol.cpp coreprotocol.h
@@ -43,7 +43,7 @@ add_library(SharedClientTest
${moc_files}
)
-qt6_generate_wayland_protocol_server_sources(SharedClientTest
+qt6_generate_wayland_protocol_server_sources(SharedWaylandClientTest
FILES
${protocols_dir}/cursor-shape/cursor-shape-v1.xml
${protocols_dir}/fullscreen-shell/fullscreen-shell-unstable-v1.xml
@@ -65,7 +65,7 @@ if(QT_FEATURE_opengl)
set(optional_libraries Qt::OpenGL)
endif()
-target_link_libraries(SharedClientTest
+target_link_libraries(SharedWaylandClientTest
PUBLIC
Qt::Gui
${optional_libraries}
@@ -74,4 +74,4 @@ target_link_libraries(SharedClientTest
Threads::Threads # special case
)
-target_include_directories(SharedClientTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(SharedWaylandClientTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})