diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-02-17 12:44:03 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-18 15:44:56 +0000 |
| commit | 5d786b626acd4fc1873d52c66cc33eed22a85953 (patch) | |
| tree | dff6249675bee14cade0273838670e41456ba902 | |
| parent | 89eda9ab1f5758ad5dde17f50b090fdfffb653a3 (diff) | |
Remove redundant code in androiddeployqt/main.cpp
Prompted by a PVS-studio article.
Change-Id: I9699cc9baf9c90a6cf5b9564cd175205a9b2fa6b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 36ea42effc0cb7eee55f0545221e6f8fffaa1179)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 3936c108b5..c7b85071b0 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -2206,16 +2206,9 @@ bool copyQtFiles(Options *options) qPrintable(sourceFileName)); } } else { - if (unmetDependencies.isEmpty()) { - if (options->verbose) { - fprintf(stdout, " -- Skipping %s, architecture mismatch.\n", - qPrintable(sourceFileName)); - } - } else { - 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; } |