diff options
author | hjk <[email protected]> | 2021-05-17 12:02:42 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2021-05-19 13:01:51 +0000 |
commit | 90ad9024861641b5535eaa6d2dd302e3f04559ea (patch) | |
tree | ab540b1d1fcb8b78a1f3dd2d9dd4145a70e4d883 /src/plugins/baremetal/keiltoolchain.cpp | |
parent | 2db9ebc61504c5455f1fb2b4ed2a1cb6115ccbfa (diff) |
Utils: Remove CommandLine argument from QtcProcess::run{,Blocking}
Makes run() more similar to what start() looks like.
Also add some asserts to make sure run() and related functions are
only called on SyncronousProcesses, as these are currently the only
ones where this works.
Change-Id: Idee6076c3f40a484db5c17f5bb348698cc83d220
Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/plugins/baremetal/keiltoolchain.cpp')
-rw-r--r-- | src/plugins/baremetal/keiltoolchain.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index a0bbdf7e4f9..120b0aee2b1 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -138,9 +138,9 @@ static Macros dumpMcsPredefinedMacros(const FilePath &compiler, const Environmen SynchronousProcess cpp; cpp.setEnvironment(env); cpp.setTimeoutS(10); + cpp.setCommand({compiler, {fakeIn.fileName()}}); - const CommandLine cmd(compiler, {fakeIn.fileName()}); - cpp.runBlocking(cmd); + cpp.runBlocking(); QString output = cpp.allOutput(); Macros macros; QTextStream stream(&output); @@ -268,8 +268,8 @@ static Macros dumpC166PredefinedMacros(const FilePath &compiler, const Environme } }; - const CommandLine cmd(compiler, {fakeIn.fileName()}); - cpp.runBlocking(cmd); + cpp.setCommand({compiler, {fakeIn.fileName()}}); + cpp.runBlocking(); const QString output = cpp.allOutput(); extractMacros(output); return macros; @@ -284,9 +284,9 @@ static Macros dumpArmPredefinedMacros(const FilePath &compiler, const QStringLis QStringList args = extraArgs; args.push_back("-E"); args.push_back("--list-macros"); - const CommandLine cmd(compiler, args); + cpp.setCommand({compiler, args}); - cpp.runBlocking(cmd); + cpp.runBlocking(); if (cpp.result() != QtcProcess::Finished || cpp.exitCode() != 0) { qWarning() << cpp.exitMessage(); return {}; |