1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace AUTOMOC by qt_manual_moc in tests

Browse Source 
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>
This commit is contained in:
Alexey Edelev 2021-05-28 17:36:50 +02:00
parent 2679eeaac9
commit e970b7487a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/wayland/shared/CMakeLists.txt
View File

@ -2,6 +2,18 @@
##Client test shared components: ##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 add_library(SharedClientTest
OBJECT OBJECT
corecompositor.cpp corecompositor.h corecompositor.cpp corecompositor.h
@ -13,10 +25,9 @@ add_library(SharedClientTest
textinput.cpp textinput.h textinput.cpp textinput.h
xdgoutputv1.cpp xdgoutputv1.h xdgoutputv1.cpp xdgoutputv1.h
xdgshell.cpp xdgshell.h xdgshell.cpp xdgshell.h
${moc_files}
) )
set_property(TARGET SharedClientTest PROPERTY AUTOMOC ON)
qt6_generate_wayland_protocol_server_sources(SharedClientTest qt6_generate_wayland_protocol_server_sources(SharedClientTest
FILES FILES
${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/fullscreen-shell-unstable-v1.xml ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/fullscreen-shell-unstable-v1.xml