Commit c9752fc6 authored by Nicolas Fella's avatar Nicolas Fella Committed by Aleix Pol Gonzalez

[android] Remove obsolete build-androiddeployqt

parent 98787875
Pipeline #22054 skipped with stage
set -e
mkdir -p ~/build/qttools
cd ~/build/qttools
if [ ! -d src/androiddeployqt ]
then
QMAKESPEC= qmake -r ~/src/qt5/qttools
fi
cd src/androiddeployqt
sudo make install
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 7164e591..7a1d3a29 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -1823,7 +1823,7 @@ bool readDependencies(Options *options)
bool ok = readDependenciesFromElf(options, fileName, &usedDependencies, &remainingDependencies);
if (!ok)
return false;
- } else if (options->verbose) {
+ } else {
fprintf(stdout, "Skipping %s due to unmet dependencies: %s\n",
qPrintable(fileName),
qPrintable(unmetDependencies.join(QLatin1Char(','))));
@@ -1834,11 +1834,9 @@ bool readDependencies(Options *options)
while (it != options->localLibs.end()) {
QStringList unmetDependencies;
if (!goodToCopy(options, absoluteFilePath(options, *it), &unmetDependencies)) {
- if (options->verbose) {
- fprintf(stdout, "Skipping %s due to unmet dependencies: %s\n",
- qPrintable(*it),
- qPrintable(unmetDependencies.join(QLatin1Char(','))));
- }
+ fprintf(stdout, "Skipping %s due to unmet dependencies: %s\n",
+ qPrintable(*it),
+ qPrintable(unmetDependencies.join(QLatin1Char(','))));
it = options->localLibs.erase(it);
} else {
++it;
@@ -2152,11 +2150,9 @@ bool copyQtFiles(Options *options)
QStringList unmetDependencies;
if (!goodToCopy(options, sourceFileName, &unmetDependencies)) {
- if (options->verbose) {
- fprintf(stdout, " -- Skipping %s. It has unmet dependencies: %s.\n",
- qPrintable(sourceFileName),
- qPrintable(unmetDependencies.join(QLatin1Char(','))));
- }
+ fprintf(stdout, " -- Skipping %s. It has unmet dependencies: %s.\n",
+ qPrintable(sourceFileName),
+ qPrintable(unmetDependencies.join(QLatin1Char(','))));
continue;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment