summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kde.org>2014-01-27 18:04:01 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-30 13:02:13 +0100
commit6a4a9747574253a4a89eacd5b33e115c9a62795c (patch)
tree6159fae2c9d6f3b5b91fb518973c2392d93d240e
parentbd4572337247e54d98a89235f70398dafb5aa4b5 (diff)
downloadqttools-6a4a9747574253a4a89eacd5b33e115c9a62795c.tar.gz
qttools-6a4a9747574253a4a89eacd5b33e115c9a62795c.tar.bz2
qttools-6a4a9747574253a4a89eacd5b33e115c9a62795c.zip
Remove all locallibs with unmet dependencies.
Change-Id: I871aaa2488f2df0d6af5f51b3a37bc0e8bc8a1c3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-rw-r--r--src/androiddeployqt/main.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 77d49e64..9710c483 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;
}