Fix handling android dependency xml.

Run readAndroidDependencyXml only once for every Qt library.

Task-number: QTBUG-34078

Change-Id: Ifc2c18f23485e2ced20b0ce3f151a21cb1a0069a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

1 files changed, 4 insertions, 10 deletions

diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 9db070642..e798a0c79 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -1173,21 +1173,15 @@ bool readDependenciesFromElf(Options *options,
         options->qtDependencies.append(dependency);
         if (options->verbose)
             fprintf(stderr, "Appending dependency: %s\n", qPrintable(dependency));
-    }
-    // Add the implicit dependencies for later
-    foreach (QString dependency, dependencies) {
-        if (dependency.startsWith(QLatin1String("lib/lib")) && dependency.endsWith(QLatin1String(".so"))) {
-            QString qtBaseName = dependency.mid(sizeof("lib/lib") - 1);
-            qtBaseName = qtBaseName.left(qtBaseName.size() - (sizeof(".so") - 1));
-            if (!readAndroidDependencyXml(options, qtBaseName, usedDependencies, remainingDependencies)) {
-                return false;
-            }
+        QString qtBaseName = dependency.mid(sizeof("lib/lib") - 1);
+        qtBaseName = qtBaseName.left(qtBaseName.size() - (sizeof(".so") - 1));
+        if (!readAndroidDependencyXml(options, qtBaseName, usedDependencies, remainingDependencies)) {
+            return false;
         }
     }
     return true;
 }
 
-
 bool readDependencies(Options *options)
 {
     if (options->verbose)