androiddeployqt: Add the missing return value check
The check doesn't affect the flow, since the same check fails the androiddeployqt execution later, when resolving all elf dependencies. Skipping the dependency from xml at earlier stage will allow to continue deployment procedure, without the missing plugins and their dependencies. Amends 54c959643ea92c0b87a7807c64f2351328cdce7d Task-number: QTBUG-106035 Task-number: QTBUG-107589 Change-Id: Ic3d38e05f8ad283244c87858fee29d1035a0da15 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
parent
7c1270ea76
commit
769a28242e
@ -1781,8 +1781,13 @@ bool readAndroidDependencyXml(Options *options,
|
||||
|
||||
if (fileName.absolutePath.endsWith(".so"_L1)) {
|
||||
QSet<QString> remainingDependencies;
|
||||
readDependenciesFromElf(options, fileName.absolutePath,
|
||||
usedDependencies, &remainingDependencies);
|
||||
if (!readDependenciesFromElf(options, fileName.absolutePath,
|
||||
usedDependencies,
|
||||
&remainingDependencies)) {
|
||||
fprintf(stdout, "Skipping dependencies from xml: %s\n",
|
||||
qPrintable(fileName.relativePath));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
usedDependencies->insert(fileName.absolutePath);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user