diff options
| author | BogDan Vatra <bogdan@kde.org> | 2020-02-11 09:57:12 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2020-02-11 11:16:42 +0200 |
| commit | dd04fb639bf357e66d0586faed78a3043a62819e (patch) | |
| tree | 55728d9db1fd23ac2749b4a2e36a4e8b9e2bde89 /src | |
| parent | 59121d29808feeb8ee4c052ba554915d5b875c9b (diff) | |
Set also ndk.dir
It's needed when ANDROID_NDK_HOME is not set
Fixes: QTBUG-81978
Change-Id: Id6108083ae62757ca839d652793d98a89e6cb6b5
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 5ac22287e2..3d378024c9 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -2287,7 +2287,8 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti bool buildAndroidProject(const Options &options) { 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)) return false; |