From c756d8d2d5e16d71115836c95fbeefa04adddea3 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 28 May 2021 13:31:50 +0200 Subject: [PATCH] BareMetal: Don't check QtcProcess exit code This is already baked into QtcProcess::Result. Change-Id: Ia601c633dd70be375b641208a471792b0b5eceff Reviewed-by: Christian Kandeler --- src/plugins/baremetal/iarewtoolchain.cpp | 2 +- src/plugins/baremetal/keiltoolchain.cpp | 2 +- src/plugins/baremetal/sdcctoolchain.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index 2d41e21dfcb..36ea2865802 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -113,7 +113,7 @@ static Macros dumpPredefinedMacros(const FilePath &compiler, const QStringList & cpp.setCommand(cmd); cpp.runBlocking(); - if (cpp.result() != QtcProcess::FinishedWithSuccess || cpp.exitCode() != 0) { + if (cpp.result() != QtcProcess::FinishedWithSuccess) { qWarning() << cpp.exitMessage(); return {}; } diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index 826462e86dd..712dcd471a2 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -287,7 +287,7 @@ static Macros dumpArmPredefinedMacros(const FilePath &compiler, const QStringLis cpp.setCommand({compiler, args}); cpp.runBlocking(); - if (cpp.result() != QtcProcess::FinishedWithSuccess || cpp.exitCode() != 0) { + if (cpp.result() != QtcProcess::FinishedWithSuccess) { qWarning() << cpp.exitMessage(); return {}; } diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index 6202f714095..eb9bceb26d2 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -93,7 +93,7 @@ static Macros dumpPredefinedMacros(const FilePath &compiler, const Environment & cpp.setCommand({compiler, {compilerTargetFlag(abi), "-dM", "-E", fakeIn.fileName()}}); cpp.runBlocking(); - if (cpp.result() != QtcProcess::FinishedWithSuccess || cpp.exitCode() != 0) { + if (cpp.result() != QtcProcess::FinishedWithSuccess) { qWarning() << cpp.exitMessage(); return {}; } @@ -114,7 +114,7 @@ static HeaderPaths dumpHeaderPaths(const FilePath &compiler, const Environment & cpp.setCommand({compiler, {compilerTargetFlag(abi), "--print-search-dirs"}}); cpp.runBlocking(); - if (cpp.result() != QtcProcess::FinishedWithSuccess || cpp.exitCode() != 0) { + if (cpp.result() != QtcProcess::FinishedWithSuccess) { qWarning() << cpp.exitMessage(); return {}; }