summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-10-01 18:40:46 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2020-10-01 22:23:33 +0300
commit4e94465096bd03f649da8b9b2e287d13a1bc3bd5 (patch)
tree9e42f20b7e100ee1dc0b7cfc2358f9c7f459f25f /src/tools
parent60eb306efe786f645ceb15a4e60cdbb90afff1d2 (diff)
Android: account for native separators when checking a dependency path
The path of dependencies (.so, .jar, etc.) might use native dir separators, but if checks when not accounting for that. Task-number: QTBUG-87066 Change-Id: I0a09231f2a19f448f1ba520fd738d129d64ff5c7 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/androiddeployqt/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 9f94c2b4ee..ea7be63072 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -2170,13 +2170,13 @@ bool copyQtFiles(Options *options)
if (qtDependency.relativePath.endsWith(QLatin1String(".so"))) {
QString garbledFileName;
- if (qtDependency.relativePath.startsWith(QLatin1String("lib/"))) {
+ if (qtDependency.relativePath.startsWith(QLatin1String("lib") + QDir::separator())) {
garbledFileName = qtDependency.relativePath.mid(sizeof("lib/") - 1);
} else {
garbledFileName = qtDependency.relativePath.mid(qtDependency.relativePath.lastIndexOf(QLatin1Char('/')) + 1);
}
destinationFileName = libsDirectory + options->currentArchitecture + QLatin1Char('/') + garbledFileName;
- } else if (qtDependency.relativePath.startsWith(QLatin1String("jar/"))) {
+ } else if (qtDependency.relativePath.startsWith(QLatin1String("jar") + QDir::separator())) {
destinationFileName = libsDirectory + qtDependency.relativePath.mid(sizeof("jar/") - 1);
} else {
destinationFileName = assetsDestinationDirectory + qtDependency.relativePath;