diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2014-05-12 08:43:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-14 15:22:14 +0200 |
| commit | d704d72a85f53d9ad346afd042e33d1d7c270e7c (patch) | |
| tree | b617fb919e9b6623e9a55a935e717f3eef321cbb | |
| parent | 82d7e1d3b4b860911ff9c784cb22e9e47d0efb2e (diff) | |
| download | qttools-d704d72a85f53d9ad346afd042e33d1d7c270e7c.tar.gz | |
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 <caroline.chao@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| -rw-r--r-- | src/androiddeployqt/main.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index db8936879..cfb4617df 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; |