Remove all locallibs with unmet dependencies.

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

diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 77d49e6..9710c48 100644 (file)
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -1284,6 +1284,21 @@ bool readDependencies(Options *options)
                     qPrintable(unmetDependencies.join(QLatin1Char(','))));
         }
     }
+
+    QStringList::iterator it = options->localLibs.begin();
+    while (it != options->localLibs.end()) {
+        QStringList unmetDependencies;
+        if (!goodToCopy(options, qtDir + *it, &unmetDependencies)) {
+            if (options->verbose) {
+                fprintf(stdout, "Skipping %s due to unmet dependencies: %s\n",
+                        qPrintable(*it),
+                        qPrintable(unmetDependencies.join(QLatin1Char(','))));
+            }
+            it = options->localLibs.erase(it);
+        } else {
+            ++it;
+        }
+    }
     return true;
 }