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

Remove the extra quote, now that we use cmake_parse_arguments(PARSE_ARGV

Browse Source 
The extra quote enforces the arguments to be string, and stops the
COMMAND_EXPAND_LISTS within
QtDbusHelpers.cmake::qt_create_qdbusxml2cpp_command from expanding it
as a list.

Fixes: QTBUG-110459
Fixes: QTBUG-110450
Task-number: QTBUG-99238
Change-Id: Ifddd6570c7bf8f2d1757f275d9445ce2924a93f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 897579edabfadd8309581659b578752b3c3bca0f)
This commit is contained in:
Amir Masoud Abdol 2023-01-23 13:52:20 +01:00
parent dd03b22d10
commit 56214249a5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtExecutableHelpers.cmake
View File

@ -125,10 +125,10 @@ function(qt_internal_add_executable name)
${arg_PUBLIC_LIBRARIES} ${arg_PUBLIC_LIBRARIES}
Qt::PlatformCommonInternal Qt::PlatformCommonInternal
${extra_libraries} ${extra_libraries}
DBUS_ADAPTOR_SOURCES "${arg_DBUS_ADAPTOR_SOURCES}" DBUS_ADAPTOR_SOURCES ${arg_DBUS_ADAPTOR_SOURCES}
DBUS_ADAPTOR_FLAGS "${arg_DBUS_ADAPTOR_FLAGS}" DBUS_ADAPTOR_FLAGS ${arg_DBUS_ADAPTOR_FLAGS}
DBUS_INTERFACE_SOURCES "${arg_DBUS_INTERFACE_SOURCES}" DBUS_INTERFACE_SOURCES ${arg_DBUS_INTERFACE_SOURCES}
DBUS_INTERFACE_FLAGS "${arg_DBUS_INTERFACE_FLAGS}" DBUS_INTERFACE_FLAGS ${arg_DBUS_INTERFACE_FLAGS}
COMPILE_OPTIONS ${arg_COMPILE_OPTIONS} COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
LINK_OPTIONS ${arg_LINK_OPTIONS} LINK_OPTIONS ${arg_LINK_OPTIONS}
MOC_OPTIONS ${arg_MOC_OPTIONS} MOC_OPTIONS ${arg_MOC_OPTIONS}

8
cmake/QtPluginHelpers.cmake
View File

@ -343,10 +343,10 @@ function(qt_internal_add_plugin target)
PUBLIC_DEFINES PUBLIC_DEFINES
${arg_PUBLIC_DEFINES} ${arg_PUBLIC_DEFINES}
FEATURE_DEPENDENCIES ${arg_FEATURE_DEPENDENCIES} FEATURE_DEPENDENCIES ${arg_FEATURE_DEPENDENCIES}
DBUS_ADAPTOR_SOURCES "${arg_DBUS_ADAPTOR_SOURCES}" DBUS_ADAPTOR_SOURCES ${arg_DBUS_ADAPTOR_SOURCES}
DBUS_ADAPTOR_FLAGS "${arg_DBUS_ADAPTOR_FLAGS}" DBUS_ADAPTOR_FLAGS ${arg_DBUS_ADAPTOR_FLAGS}
DBUS_INTERFACE_SOURCES "${arg_DBUS_INTERFACE_SOURCES}" DBUS_INTERFACE_SOURCES ${arg_DBUS_INTERFACE_SOURCES}
DBUS_INTERFACE_FLAGS "${arg_DBUS_INTERFACE_FLAGS}" DBUS_INTERFACE_FLAGS ${arg_DBUS_INTERFACE_FLAGS}
COMPILE_OPTIONS ${arg_COMPILE_OPTIONS} COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
PUBLIC_COMPILE_OPTIONS ${arg_PUBLIC_COMPILE_OPTIONS} PUBLIC_COMPILE_OPTIONS ${arg_PUBLIC_COMPILE_OPTIONS}
LINK_OPTIONS ${arg_LINK_OPTIONS} LINK_OPTIONS ${arg_LINK_OPTIONS}

4
cmake/QtTargetHelpers.cmake
View File

@ -68,7 +68,7 @@ function(qt_internal_extend_target target)
qt_create_qdbusxml2cpp_command("${target}" "${adaptor}" qt_create_qdbusxml2cpp_command("${target}" "${adaptor}"
ADAPTOR ADAPTOR
BASENAME "${arg_DBUS_ADAPTOR_BASENAME}" BASENAME "${arg_DBUS_ADAPTOR_BASENAME}"
FLAGS "${arg_DBUS_ADAPTOR_FLAGS}" FLAGS ${arg_DBUS_ADAPTOR_FLAGS}
) )
list(APPEND dbus_sources "${adaptor}") list(APPEND dbus_sources "${adaptor}")
endforeach() endforeach()
@ -77,7 +77,7 @@ function(qt_internal_extend_target target)
qt_create_qdbusxml2cpp_command("${target}" "${interface}" qt_create_qdbusxml2cpp_command("${target}" "${interface}"
INTERFACE INTERFACE
BASENAME "${arg_DBUS_INTERFACE_BASENAME}" BASENAME "${arg_DBUS_INTERFACE_BASENAME}"
FLAGS "${arg_DBUS_INTERFACE_FLAGS}" FLAGS ${arg_DBUS_INTERFACE_FLAGS}
) )
list(APPEND dbus_sources "${interface}") list(APPEND dbus_sources "${interface}")
endforeach() endforeach()