summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-05-28 17:36:50 +0200
committerAlexey Edelev <alexey.edelev@qt.io>2021-05-29 12:34:35 +0200
commit87c0677c696962e7de78e5bea1dc74aac2ea2d27 (patch)
treec2d0addf915c64e35aa8f612636d61a4ed8b778b
parent4ba3bd736e6ba1835a0b0b51d101101c39a58433 (diff)
downloadqtwayland-87c0677c696962e7de78e5bea1dc74aac2ea2d27.tar.gz
Replace AUTOMOC by qt_manual_moc in tests
AUTOMOC can not be used in Qt internal testing, since Qt::moc target is not available at configure phase. Replace it by the qt_manual_moc call. Fixes: QTBUG-94085 Change-Id: I793091357d536612ae2a81032606be68dee3a6d2 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--tests/auto/client/shared/CMakeLists.txt15
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/auto/client/shared/CMakeLists.txt b/tests/auto/client/shared/CMakeLists.txt
index 6116688c..2ce9c23a 100644
--- a/tests/auto/client/shared/CMakeLists.txt
+++ b/tests/auto/client/shared/CMakeLists.txt
@@ -2,6 +2,18 @@
##Client test shared components:
#####################################################################
+qt_manual_moc(moc_files
+ mockcompositor.h
+ coreprotocol.h
+ corecompositor.h
+ datadevice.h
+ fullscreenshellv1.h
+ iviapplication.h
+ textinput.h
+ xdgoutputv1.h
+ xdgshell.h
+)
+
add_library(SharedClientTest
OBJECT
corecompositor.cpp corecompositor.h
@@ -13,10 +25,9 @@ add_library(SharedClientTest
textinput.cpp textinput.h
xdgoutputv1.cpp xdgoutputv1.h
xdgshell.cpp xdgshell.h
+ ${moc_files}
)
-set_property(TARGET SharedClientTest PROPERTY AUTOMOC ON)
-
qt6_generate_wayland_protocol_server_sources(SharedClientTest
FILES
${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/fullscreen-shell-unstable-v1.xml