summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2020-10-02 12:57:02 +0200
committerAlessandro Portale <alessandro.portale@qt.io>2020-10-02 11:55:20 +0000
commitc3b0828e3bc60a621a7caf3c04eb790811a3dd1b (patch)
tree711c0a3fd02f521a096bca0ba90268514fc27778
parent8d057fea987e7dc72b9bf2111c5f75bdd541f496 (diff)
Android: Make checking a dependency path accept both separator styles
The path of dependencies (.so, .jar, etc.) might use either native or non-native dir separators. Let's support both cases. Amends: 4e94465096bd03f649da8b9b2e287d13a1bc3bd5 Task-number: QTBUG-87066 Change-Id: I8ce3235db5bab8c4c139f841d3a2fe74d3c7c7f2 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
-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 ea7be63072..047d78773d 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") + QDir::separator())) {
+ if (QDir::fromNativeSeparators(qtDependency.relativePath).startsWith(QLatin1String("lib/"))) {
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") + QDir::separator())) {
+ } else if (QDir::fromNativeSeparators(qtDependency.relativePath).startsWith(QLatin1String("jar/"))) {
destinationFileName = libsDirectory + qtDependency.relativePath.mid(sizeof("jar/") - 1);
} else {
destinationFileName = assetsDestinationDirectory + qtDependency.relativePath;