From e970b7487a2d4a08dd805e70e55cfb9bc314092f Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 28 May 2021 17:36:50 +0200 Subject: [PATCH] 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 --- tests/auto/wayland/shared/CMakeLists.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/auto/wayland/shared/CMakeLists.txt b/tests/auto/wayland/shared/CMakeLists.txt index 6116688c36e..2ce9c23a3b0 100644 --- a/tests/auto/wayland/shared/CMakeLists.txt +++ b/tests/auto/wayland/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