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

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 <[email protected]> Reviewed-by: Ivan Solovev <[email protected]> Reviewed-by: Alexey Edelev <[email protected]>
petrmanek · Jan 23, 2023 · 897579e · 897579e
1 parent 97a7e7b
commit 897579e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake
@@ -119,10 +119,10 @@ function(qt_internal_add_executable name)
             ${arg_PUBLIC_LIBRARIES}
             Qt::PlatformCommonInternal
             ${extra_libraries}
-        DBUS_ADAPTOR_SOURCES "${arg_DBUS_ADAPTOR_SOURCES}"
-        DBUS_ADAPTOR_FLAGS "${arg_DBUS_ADAPTOR_FLAGS}"
-        DBUS_INTERFACE_SOURCES "${arg_DBUS_INTERFACE_SOURCES}"
-        DBUS_INTERFACE_FLAGS "${arg_DBUS_INTERFACE_FLAGS}"
+        DBUS_ADAPTOR_SOURCES ${arg_DBUS_ADAPTOR_SOURCES}
+        DBUS_ADAPTOR_FLAGS ${arg_DBUS_ADAPTOR_FLAGS}
+        DBUS_INTERFACE_SOURCES ${arg_DBUS_INTERFACE_SOURCES}
+        DBUS_INTERFACE_FLAGS ${arg_DBUS_INTERFACE_FLAGS}
         COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
         LINK_OPTIONS ${arg_LINK_OPTIONS}
         MOC_OPTIONS ${arg_MOC_OPTIONS}

diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake
@@ -336,10 +336,10 @@ function(qt_internal_add_plugin target)
         PUBLIC_DEFINES
             ${arg_PUBLIC_DEFINES}
         FEATURE_DEPENDENCIES ${arg_FEATURE_DEPENDENCIES}
-        DBUS_ADAPTOR_SOURCES "${arg_DBUS_ADAPTOR_SOURCES}"
-        DBUS_ADAPTOR_FLAGS "${arg_DBUS_ADAPTOR_FLAGS}"
-        DBUS_INTERFACE_SOURCES "${arg_DBUS_INTERFACE_SOURCES}"
-        DBUS_INTERFACE_FLAGS "${arg_DBUS_INTERFACE_FLAGS}"
+        DBUS_ADAPTOR_SOURCES ${arg_DBUS_ADAPTOR_SOURCES}
+        DBUS_ADAPTOR_FLAGS ${arg_DBUS_ADAPTOR_FLAGS}
+        DBUS_INTERFACE_SOURCES ${arg_DBUS_INTERFACE_SOURCES}
+        DBUS_INTERFACE_FLAGS ${arg_DBUS_INTERFACE_FLAGS}
         COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
         PUBLIC_COMPILE_OPTIONS ${arg_PUBLIC_COMPILE_OPTIONS}
         LINK_OPTIONS ${arg_LINK_OPTIONS}

diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
@@ -70,7 +70,7 @@ function(qt_internal_extend_target target)
             qt_create_qdbusxml2cpp_command("${target}" "${adaptor}"
                 ADAPTOR
                 BASENAME "${arg_DBUS_ADAPTOR_BASENAME}"
-                FLAGS "${arg_DBUS_ADAPTOR_FLAGS}"
+                FLAGS ${arg_DBUS_ADAPTOR_FLAGS}
             )
             list(APPEND dbus_sources "${adaptor}")
         endforeach()
@@ -79,7 +79,7 @@ function(qt_internal_extend_target target)
             qt_create_qdbusxml2cpp_command("${target}" "${interface}"
                 INTERFACE
                 BASENAME "${arg_DBUS_INTERFACE_BASENAME}"
-                FLAGS "${arg_DBUS_INTERFACE_FLAGS}"
+                FLAGS ${arg_DBUS_INTERFACE_FLAGS}
             )
             list(APPEND dbus_sources "${interface}")
         endforeach()