diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-07-11 14:43:49 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-07-15 09:36:46 +0000 |
| commit | faac0ef8c6f418aab019d7eb96d32178cddab4be (patch) | |
| tree | 8b19bc00b61b62088492165970352ff10d6ef23a /util | |
| parent | 4dac45c9ee59ff6586d90d423654da91523ab679 (diff) | |
Add missing expansion for $$_PRO_FILE_PWD_
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>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |