From 4e94465096bd03f649da8b9b2e287d13a1bc3bd5 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 1 Oct 2020 18:40:46 +0300 Subject: 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 --- src/tools/androiddeployqt/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools') 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; -- cgit v1.2.3