From d704d72a85f53d9ad346afd042e33d1d7c270e7c Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 12 May 2014 08:43:19 +0200 Subject: [PATCH] androiddeployqt: Remove warning about missing dependency In 08672adb97c0707c513850a27aaec59327874260 in qtbase, the MODULE_PLUGIN_TYPES of QtGui was expanded to contain some more plugin types which are not built on Android, causing warnings during every deployment. Since MODULE_PLUGIN_TYPES is common to all platforms we should just ignore it if it specifies plugins that do not exist. [ChangeLog][androiddeployqt] Remove warning about missing dependency. Task-number: QTBUG-38651 Change-Id: I57a2c1d79b859981b3adf2772be4f0cd8a98be12 Reviewed-by: Caroline Chao Reviewed-by: Paul Olav Tvete --- src/androiddeployqt/main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index db89368..cfb4617 100644 --- a/src/androiddeployqt/main.cpp +++ b/src/androiddeployqt/main.cpp @@ -1120,10 +1120,8 @@ bool updateAndroidFiles(Options &options) QStringList findFilesRecursively(const Options &options, const QString &fileName) { QFileInfo info(options.qtInstallDirectory + QLatin1Char('/') + fileName); - if (!info.exists()) { - fprintf(stderr, "Warning: Dependency not found: %s\n", qPrintable(info.filePath())); + if (!info.exists()) return QStringList(); - } if (info.isDir()) { QStringList ret; -- 2.7.4