summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
diff options
context:
space:
mode:
authorhjk <qthjk@ovi.com>2012-08-14 10:16:53 +0200
committerhjk <qthjk@ovi.com>2012-08-14 14:03:14 +0200
commit98a5fefb9a07de15a49fc324ce03002d6dfac493 (patch)
tree8929948cfef39111b7429760a3f126e01c8160d8 /src/plugins/debugger/gdb/remotegdbserveradapter.cpp
parentd42b9b026a8c982b7c1e56e0b5a9c9c50c664bd3 (diff)
downloadqt-creator-98a5fefb9a07de15a49fc324ce03002d6dfac493.tar.gz
debugger: simplify the handling of the start script option
Script will be used if and only if there is one given. No extra bool. Change-Id: I095e01b2243f0fa1f7ba2ce9591e3d67b6de5241 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/debugger/gdb/remotegdbserveradapter.cpp')
-rw-r--r--src/plugins/debugger/gdb/remotegdbserveradapter.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
index 61b0343447..c4d8505eea 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
@@ -86,13 +86,9 @@ void GdbRemoteServerEngine::setupEngine()
{
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
showMessage(_("TRYING TO START ADAPTER"));
- if (startParameters().useServerStartScript) {
- if (startParameters().serverStartScript.isEmpty()) {
- showMessage(_("No server start script given. "), StatusBar);
- } else {
- m_uploadProc.start(_("/bin/sh ") + startParameters().serverStartScript);
- m_uploadProc.waitForStarted();
- }
+ if (!startParameters().serverStartScript.isEmpty()) {
+ m_uploadProc.start(_("/bin/sh ") + startParameters().serverStartScript);
+ m_uploadProc.waitForStarted();
}
if (startParameters().remoteSetupNeeded)
notifyEngineRequestRemoteSetup();