From 59b940ff418cf4c134face2a3c56a593bd75d5ca Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 16 Sep 2019 13:54:03 +0200
Subject: [PATCH] pro2cmake: Recursively expand $$FOO variables

Given HEADERS = $$PUBLIC_HEADERS $$PRIVATE_HEADERS
$$PUBLIC_HEADERS can be expanded into a list of source files
which in turn contain $$PWD/foo.cpp.
The $$PWD needs to be expanded as well.

This is the case for qtwebsockets/src/websockets/websockets.pro
project.

Change-Id: I3aa14203ee8d177fadd12a7e3212c3250970e0a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 util/cmake/pro2cmake.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 99b42797288..cc5373c31a5 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -811,7 +811,12 @@ class Scope(object):
                 if len(get_result) == 1:
                     result = get_result[0]
                 else:
-                    return get_result
+                    # Recursively expand each value from the result list
+                    # returned from self.get().
+                    result_list = []
+                    for entry_value in get_result:
+                        result_list += self._expand_value(entry_value)
+                    return result_list
             else:
                 replacement = self.get(match.group(1), inherit = True)
                 replacement_str = replacement[0] if replacement else ''