From faac0ef8c6f418aab019d7eb96d32178cddab4be Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@qt.io>
Date: Thu, 11 Jul 2019 14:43:49 +0200
Subject: Add missing expansion for $$_PRO_FILE_PWD_
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tests in qtdeclarative were failing because the above variable was
expanded to an empty string. This causes the tests to be unable to
locate their test data when executed.

Change-Id: Ibc3c094123f25d688a73c11886ac1673b6930c54
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 util/cmake/pro2cmake.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util/cmake/pro2cmake.py')

diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 96e2bacae9..4e128c4c15 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -594,7 +594,7 @@ class Scope(object):
 
         is_same_path = self.currentdir == self.basedir
 
-        if key == 'PWD':
+        if key == '_PRO_FILE_PWD_' or key == 'PWD':
             if is_same_path:
                 return ['${CMAKE_CURRENT_SOURCE_DIR}']
             else:
-- 
cgit v1.2.3