androiddeployqt: Remove warning about missing dependency
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Mon, 12 May 2014 06:43:19 +0000 (08:43 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 14 May 2014 13:22:14 +0000 (15:22 +0200)
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 <caroline.chao@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
src/androiddeployqt/main.cpp

index db89368..cfb4617 100644 (file)
@@ -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;