diff --git a/system-images/android/sdk/build-androiddeployqt b/system-images/android/sdk/build-androiddeployqt deleted file mode 100644 index 164decd..0000000 --- a/system-images/android/sdk/build-androiddeployqt +++ /dev/null @@ -1,10 +0,0 @@ -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/system-images/android/sdk/qt5-qttools-unmetdepsnotverbose.patch b/system-images/android/sdk/qt5-qttools-unmetdepsnotverbose.patch deleted file mode 100644 index ededabe..0000000 --- a/system-images/android/sdk/qt5-qttools-unmetdepsnotverbose.patch +++ /dev/null @@ -1,43 +0,0 @@ -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; - } -