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

Stop depending on private API in user-facing cmake code

Browse Source 
The qt_parse_all_arguments() macro is not available as part of the
public API, but it was used to generate code for extensions, which
users need to be able to do. The result was that top-level builds would
work because they could access the functions, but when our examples
were built as stand-alone, it failed to find the function.

The fix is just to copy-paste the contents of the macro.

Fixes: QTBUG-87445
Fixes: QTBUG-87446
Change-Id: Id5a583358be4163d3cdab72d7c23804f66f45500
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2020-10-30 07:42:17 +01:00
parent afe107fb13
commit edbc9697b6
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake
View File

@ -1,5 +1,9 @@
function(qt6_generate_wayland_protocol_client_sources target)
qt_parse_all_arguments(arg "qt6_generate_wayland_protocol_client_sources" "" "" "FILES" ${ARGN})
cmake_parse_arguments(arg "" "" "FILES" ${ARGN})
if(DEFINED arg_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unknown arguments were passed to qt6_generate_wayland_protocol_client_sources: (${arg_UNPARSED_ARGUMENTS}).")
endif()
get_target_property(target_binary_dir ${target} BINARY_DIR)
if(NOT TARGET Wayland::Scanner)

6
src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake
View File

@ -1,5 +1,9 @@
function(qt6_generate_wayland_protocol_server_sources target)
qt_parse_all_arguments(arg "qt6_generate_wayland_protocol_server_sources" "" "" "FILES" ${ARGN})
cmake_parse_arguments(arg "" "" "FILES" ${ARGN})
if(DEFINED arg_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unknown arguments were passed to qt6_generate_wayland_protocol_server_sources: (${arg_UNPARSED_ARGUMENTS}).")
endif()
get_target_property(target_binary_dir ${target} BINARY_DIR)
if(NOT TARGET Wayland::Scanner)