summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/debuggerplugin.cpp
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-06-26 13:06:08 +0200
committerhjk <hjk@theqtcompany.com>2015-06-26 18:14:57 +0000
commit1538dca81aca4f82afef72340d91efc967face5b (patch)
tree63d8e0a47b1d4a6e6e9e35b16a3785066804d859 /src/plugins/debugger/debuggerplugin.cpp
parentf84169b51ebd02ddaff8d207e647e3d51853f2ba (diff)
downloadqt-creator-1538dca81aca4f82afef72340d91efc967face5b.tar.gz
Debugger: Continue DebuggerStartParameter cleanup
- Move sysRoot, debuggerCommand, targetAbi to DebuggerRunParameters, they are always the one coming from the kit. - Move projectSource{Directory,Files} to DebuggerRunParameters, they are alway coming from the runConfiguration's project - Pass RunConfiguration always as separate parameter, that's what related code does. Change-Id: I9965a052237af53fa2d170701bc88b552cab12ed Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
-rw-r--r--src/plugins/debugger/debuggerplugin.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index a8d0fd4b85..261bbfb2a8 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2290,19 +2290,14 @@ static QString formatStartParameters(DebuggerRunParameters &sp)
str << "PID: " << sp.attachPID << ' ' << sp.crashParameter << '\n';
if (!sp.projectSourceDirectory.isEmpty()) {
str << "Project: " << QDir::toNativeSeparators(sp.projectSourceDirectory);
- if (!sp.projectBuildDirectory.isEmpty())
- str << " (built: " << QDir::toNativeSeparators(sp.projectBuildDirectory)
- << ')';
- str << '\n';
str << "Addtional Search Directories:"
<< sp.additionalSearchDirectories.join(QLatin1Char(' ')) << '\n';
}
if (!sp.qmlServerAddress.isEmpty())
str << "QML server: " << sp.qmlServerAddress << ':'
<< sp.qmlServerPort << '\n';
- if (!sp.remoteChannel.isEmpty()) {
+ if (!sp.remoteChannel.isEmpty())
str << "Remote: " << sp.remoteChannel << '\n';
- }
str << "Sysroot: " << sp.sysRoot << '\n';
str << "Debug Source Location: " << sp.debugSourceLocation.join(QLatin1Char(':')) << '\n';
return rc;