From d5dc755c653b56d8c09d8331e3a56e0382cf5ac5 Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@qt.io>
Date: Tue, 22 Oct 2019 14:14:30 +0200
Subject: [PATCH] Convert ANDROID_PACKAGE_SOURCE_DIR for android (pro2cmake)

Change-Id: I76730852e4433d095bc42ff617254a77f2d1bf51
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 util/cmake/pro2cmake.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index e9492f74842..36e899d7810 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -2171,11 +2171,12 @@ def write_android_part(cm_fh: IO[str], target: str, scope: Scope, indent: int =
         "ANDROID_LIB_DEPENDENCY_REPLACEMENTS",
         "ANDROID_BUNDLED_FILES",
         "ANDROID_PERMISSIONS",
+        "ANDROID_PACKAGE_SOURCE_DIR"
     ]
 
     has_no_values = True
     for key in keys:
-        value = scope.get(key)
+        value = scope.expand(key)
         if len(value) != 0:
             if has_no_values:
                 if scope.condition: