Merge branch 'wip/qt6' into wip/cmake

Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b

1 files changed, 4 insertions, 0 deletions

diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index f6d354f19c..26c346eef9 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -311,6 +311,10 @@ def handle_function_value(group: pp.ParseResults):
         # Do nothing, just return a string result
         return str(group)
 
+    # Return the whole expression as a string.
+    if function_name in ['join', 'cmakeRelativePath', 'shell_quote', 'shadowed']:
+        return 'join({})'.format(''.join(function_args))
+
     raise RuntimeError('No logic to handle function "{}", please add one in handle_function_value().'.format(function_name))
 
 class Operation: