From 6a4a9747574253a4a89eacd5b33e115c9a62795c Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 27 Jan 2014 18:04:01 +0200 Subject: [PATCH] Remove all locallibs with unmet dependencies. Change-Id: I871aaa2488f2df0d6af5f51b3a37bc0e8bc8a1c3 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/androiddeployqt/main.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index 77d49e6..9710c48 100644 --- 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; } -- 2.7.4