1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant code in androiddeployqt/main.cpp

Browse Source 
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>
This commit is contained in:
Edward Welbourne 2021-02-17 12:44:03 +01:00 committed by Qt Cherry-pick Bot
parent 33bc82f466
commit 8ae64f3d08
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/androiddeployqt/main.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the tools applications of the Qt Toolkit. ** This file is part of the tools applications of the Qt Toolkit.
@ -2200,12 +2200,6 @@ bool copyQtFiles(Options *options)
QStringList unmetDependencies; QStringList unmetDependencies;
if (!goodToCopy(options, sourceFileName, &unmetDependencies)) { if (!goodToCopy(options, sourceFileName, &unmetDependencies)) {
if (unmetDependencies.isEmpty()) {
if (options->verbose) {
fprintf(stdout, " -- Skipping %s, architecture mismatch.\n",
qPrintable(sourceFileName));
}
} else {
if (unmetDependencies.isEmpty()) { if (unmetDependencies.isEmpty()) {
if (options->verbose) { if (options->verbose) {
fprintf(stdout, " -- Skipping %s, architecture mismatch.\n", fprintf(stdout, " -- Skipping %s, architecture mismatch.\n",
@ -2216,7 +2210,6 @@ bool copyQtFiles(Options *options)
qPrintable(sourceFileName), qPrintable(sourceFileName),
qPrintable(unmetDependencies.join(QLatin1Char(',')))); qPrintable(unmetDependencies.join(QLatin1Char(','))));
} }
}
continue; continue;
} }