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

CMake: Make WAYLAND_INCLUDE_DIR argument internal

Browse Source 
As discussed in QTBUG-95177, this argument of
qt6_generate_wayland_protocol_{client|server}_sources is for internal
use only and should not be exposed publicly.

Rename this argument to __QT_INTERNAL_WAYLAND_INCLUDE_DIR.

Fixes: QTBUG-95177
Change-Id: I1437007b4bfd398372a932ec09a5eba0daa9af69
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-08-04 10:34:42 +02:00
parent 6e14376d6d
commit 8c657f5819
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt
View File

@ -18,7 +18,7 @@ qt_internal_add_module(WlShellIntegrationPrivate
qt6_generate_wayland_protocol_client_sources(WlShellIntegrationPrivate qt6_generate_wayland_protocol_client_sources(WlShellIntegrationPrivate
# this is just a helper module and still part of the QtWaylandClient build # this is just a helper module and still part of the QtWaylandClient build
WAYLAND_INCLUDE_DIR QtWaylandClient/private __QT_INTERNAL_WAYLAND_INCLUDE_DIR QtWaylandClient/private
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/wayland.xml
) )

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

@ -1,5 +1,5 @@
function(qt6_generate_wayland_protocol_client_sources target) function(qt6_generate_wayland_protocol_client_sources target)
cmake_parse_arguments(arg "" "WAYLAND_INCLUDE_DIR" "FILES" ${ARGN}) cmake_parse_arguments(arg "" "__QT_INTERNAL_WAYLAND_INCLUDE_DIR" "FILES" ${ARGN})
if(DEFINED arg_UNPARSED_ARGUMENTS) if(DEFINED arg_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unknown arguments were passed to qt6_generate_wayland_protocol_client_sources: (${arg_UNPARSED_ARGUMENTS}).") message(FATAL_ERROR "Unknown arguments were passed to qt6_generate_wayland_protocol_client_sources: (${arg_UNPARSED_ARGUMENTS}).")
endif() endif()
@ -35,8 +35,8 @@ function(qt6_generate_wayland_protocol_client_sources target)
) )
set(wayland_include_dir "") set(wayland_include_dir "")
if(arg_WAYLAND_INCLUDE_DIR) if(arg___QT_INTERNAL_WAYLAND_INCLUDE_DIR)
set(wayland_include_dir "${arg_WAYLAND_INCLUDE_DIR}") set(wayland_include_dir "${arg___QT_INTERNAL_WAYLAND_INCLUDE_DIR}")
else() else()
get_target_property(qt_module ${target} _qt_module_interface_name) get_target_property(qt_module ${target} _qt_module_interface_name)
get_target_property(is_for_module "${target}" _qt_module_has_headers) get_target_property(is_for_module "${target}" _qt_module_has_headers)

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

@ -1,5 +1,5 @@
function(qt6_generate_wayland_protocol_server_sources target) function(qt6_generate_wayland_protocol_server_sources target)
cmake_parse_arguments(arg "" "WAYLAND_INCLUDE_DIR" "FILES" ${ARGN}) cmake_parse_arguments(arg "" "__QT_INTERNAL_WAYLAND_INCLUDE_DIR" "FILES" ${ARGN})
if(DEFINED arg_UNPARSED_ARGUMENTS) if(DEFINED arg_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unknown arguments were passed to qt6_generate_wayland_protocol_server_sources: (${arg_UNPARSED_ARGUMENTS}).") message(FATAL_ERROR "Unknown arguments were passed to qt6_generate_wayland_protocol_server_sources: (${arg_UNPARSED_ARGUMENTS}).")
endif() endif()
@ -33,8 +33,8 @@ function(qt6_generate_wayland_protocol_server_sources target)
) )
set(wayland_include_dir "") set(wayland_include_dir "")
if(arg_WAYLAND_INCLUDE_DIR) if(arg___QT_INTERNAL_WAYLAND_INCLUDE_DIR)
set(wayland_include_dir "${arg_WAYLAND_INCLUDE_DIR}") set(wayland_include_dir "${arg___QT_INTERNAL_WAYLAND_INCLUDE_DIR}")
else() else()
get_target_property(qt_module ${target} _qt_module_interface_name) get_target_property(qt_module ${target} _qt_module_interface_name)
get_target_property(is_for_module "${target}" _qt_module_has_headers) get_target_property(is_for_module "${target}" _qt_module_has_headers)