diff options
| author | Eskil Abrahamsen Blomfeldt <[email protected]> | 2020-03-18 13:57:21 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <[email protected]> | 2020-03-19 10:23:07 +0100 |
| commit | 1a18e138f4d17c219c6ffd6e4396c30b960818b4 (patch) | |
| tree | 5214f4a8e0b0f89ab3809a8e89365f37f38299d8 /src/tools/androiddeployqt/main.cpp | |
| parent | 3d25bbcdf161c49b59d6c36417a087e3c07068b6 (diff) | |
Android: Fix deployment on Windows host
The paths in the build properties require forward slashes
apparently. On Windows, we would default to native backslashes
and they would be stripped from the path. Converting to forward
slashes fixes the problem.
Issue was introduced by dd04fb639bf357e66d0586faed78a3043a62819e,
since before that, the NDK path was retrieved from the environment.
Fixes: QTBUG-82944
Change-Id: I6c51113efcf671461a5871991b3225a52b95266c
Reviewed-by: BogDan Vatra <[email protected]>
Diffstat (limited to 'src/tools/androiddeployqt/main.cpp')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 80612d34ac8..c2710c56198 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -2287,8 +2287,8 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti bool buildAndroidProject(const Options &options) { GradleProperties localProperties; - localProperties["sdk.dir"] = options.sdkPath.toUtf8(); - localProperties["ndk.dir"] = options.ndkPath.toUtf8(); + localProperties["sdk.dir"] = QDir::fromNativeSeparators(options.sdkPath).toUtf8(); + localProperties["ndk.dir"] = QDir::fromNativeSeparators(options.ndkPath).toUtf8(); if (!mergeGradleProperties(options.outputDirectory + QLatin1String("local.properties"), localProperties)) return false; |