1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: account for native separators when checking a dependency path

Browse Source 
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>
This commit is contained in:
Assam Boudjelthia 2020-10-01 18:40:46 +03:00
parent 60eb306efe
commit 4e94465096
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/androiddeployqt/main.cpp
View File

@ -2170,13 +2170,13 @@ bool copyQtFiles(Options *options)
if (qtDependency.relativePath.endsWith(QLatin1String(".so"))) { if (qtDependency.relativePath.endsWith(QLatin1String(".so"))) {
QString garbledFileName; QString garbledFileName;
if (qtDependency.relativePath.startsWith(QLatin1String("lib/"))) { if (qtDependency.relativePath.startsWith(QLatin1String("lib") + QDir::separator())) {
garbledFileName = qtDependency.relativePath.mid(sizeof("lib/") - 1); garbledFileName = qtDependency.relativePath.mid(sizeof("lib/") - 1);
} else { } else {
garbledFileName = qtDependency.relativePath.mid(qtDependency.relativePath.lastIndexOf(QLatin1Char('/')) + 1); garbledFileName = qtDependency.relativePath.mid(qtDependency.relativePath.lastIndexOf(QLatin1Char('/')) + 1);
} }
destinationFileName = libsDirectory + options->currentArchitecture + QLatin1Char('/') + garbledFileName; 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); destinationFileName = libsDirectory + qtDependency.relativePath.mid(sizeof("jar/") - 1);
} else { } else {
destinationFileName = assetsDestinationDirectory + qtDependency.relativePath; destinationFileName = assetsDestinationDirectory + qtDependency.relativePath;