diff options
author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2023-07-27 21:07:50 +1000 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-08-15 16:18:41 +0000 |
commit | c27798da2f5a426e50423a83a42d8ddaa0abbc13 (patch) | |
tree | 27a372c47e58ca2b9a0fe4f7fb8ff86c46003b97 /src/tools/androiddeployqt/main.cpp | |
parent | b0827bf8d43768153186181a7ef8fde3f9c95d40 (diff) |
androiddeployqt: Fix generation of qtDataDirectory
Commit 9db5ca87897340873a4606c651a37e0356e8f1a0 sets the default
qtDataDirectory to the value of qtInstallDirectory, which results in an
invalid path when appended to the SDK. This results in build failures
for Android when building with qbs. cmake builds are not affected as
the data directory is explicitly set in the build scripts.
Pick-to: 6.6 6.5
Change-Id: Ia29c5bae7648f5fccefe019c225e187985bd2592
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/tools/androiddeployqt/main.cpp')
-rw-r--r-- | src/tools/androiddeployqt/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 4bb43f4236..b969183cdd 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -842,7 +842,7 @@ bool readInputFileDirectory(Options *options, QJsonObject &jsonObject, const QSt if (qtDirectory.isUndefined()) { for (auto it = options->architectures.constBegin(); it != options->architectures.constEnd(); ++it) { if (keyName == "qtDataDirectory"_L1) { - options->architectures[it.key()].qtDirectories[keyName] = it.value().qtInstallDirectory; + options->architectures[it.key()].qtDirectories[keyName] = "."_L1; break; } else if (keyName == "qtLibsDirectory"_L1) { options->architectures[it.key()].qtDirectories[keyName] = "lib"_L1; |