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>
This commit is contained in:
parent
60eb306efe
commit
4e94465096
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user