aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Drozdov <adrozdoff@gmail.com>2015-07-03 12:39:32 +1000
committerhjk <hjk@theqtcompany.com>2015-07-06 08:58:59 +0000
commit732d9f3e6cb04548281e3beebab10e681c87fb6f (patch)
treee65dae563bce3cd0c00718afcf6627bf5214f690
parentc691cca48d3e631e6d74cad92b2bd21a086429b1 (diff)
BareMetal: fix OpenOCD additional arguments processing
Plugin incorrectly process additional OpenOCD arguments in case of Network or Pipe startup modes: all arguments in this line interprets as one big argument. So, it must be split before using Utils::QtcProcess::splitArgs(). Otherwise debugging fails to start if additional arguments consists from two or more parameters. Change-Id: I5645c0d5a43a58399135c1225f01fe160873a68d Reviewed-by: Tim Sander <tim@krieglstein.org> Reviewed-by: hjk <hjk@theqtcompany.com>
-rw-r--r--src/plugins/baremetal/openocdgdbserverprovider.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/baremetal/openocdgdbserverprovider.cpp b/src/plugins/baremetal/openocdgdbserverprovider.cpp
index 5e525e0849..96ef6e9ba5 100644
--- a/src/plugins/baremetal/openocdgdbserverprovider.cpp
+++ b/src/plugins/baremetal/openocdgdbserverprovider.cpp
@@ -35,6 +35,7 @@
#include <utils/pathchooser.h>
#include <utils/qtcassert.h>
#include <utils/fileutils.h>
+#include <utils/qtcprocess.h>
#include <coreplugin/variablechooser.h>
@@ -145,7 +146,7 @@ QStringList OpenOcdGdbServerProvider::arguments() const
args << QLatin1String("-f") << m_configurationFile;
if (!m_additionalArguments.isEmpty())
- args << m_additionalArguments;
+ args << Utils::QtcProcess::splitArgs(m_additionalArguments);
return args;
}