1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set also ndk.dir

Browse Source 
It's needed when ANDROID_NDK_HOME is not set

Fixes: QTBUG-81978
Change-Id: Id6108083ae62757ca839d652793d98a89e6cb6b5
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
BogDan Vatra 2020-02-11 09:57:12 +02:00
parent 59121d2980
commit dd04fb639b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/androiddeployqt/main.cpp
View File

@ -2287,7 +2287,8 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti
bool buildAndroidProject(const Options &options) bool buildAndroidProject(const Options &options)
{ {
GradleProperties localProperties; GradleProperties localProperties;
localProperties["sdk.dir"] = options.sdkPath.toLocal8Bit(); localProperties["sdk.dir"] = options.sdkPath.toUtf8();
localProperties["ndk.dir"] = options.ndkPath.toUtf8();
if (!mergeGradleProperties(options.outputDirectory + QLatin1String("local.properties"), localProperties)) if (!mergeGradleProperties(options.outputDirectory + QLatin1String("local.properties"), localProperties))
return false; return false;