diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
commit | 4a826ada0486dd2c07b3932c6e62ad375f0edfbb (patch) | |
tree | 39360b652210c9d92506fe0c0170f8e45a91b159 /src/plugins/qnx/qnxruncontrolfactory.cpp | |
parent | 582c46d34f28f9e04af4d8179f455a603ded5ec7 (diff) | |
parent | 427bb8c363fc3ee0d9c12ca7ac01d47dc0f6f8f4 (diff) | |
download | qt-creator-4a826ada0486dd2c07b3932c6e62ad375f0edfbb.tar.gz |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
Diffstat (limited to 'src/plugins/qnx/qnxruncontrolfactory.cpp')
-rw-r--r-- | src/plugins/qnx/qnxruncontrolfactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp index b65ded3e80..144c69221c 100644 --- a/src/plugins/qnx/qnxruncontrolfactory.cpp +++ b/src/plugins/qnx/qnxruncontrolfactory.cpp @@ -65,8 +65,8 @@ static DebuggerStartParameters createDebuggerStartParameters(QnxRunConfiguration params.startMode = AttachToRemoteServer; params.useCtrlCStub = true; - params.inferior.executable = runConfig->localExecutableFilePath(); - params.remoteExecutable = runConfig->remoteExecutableFilePath(); + params.inferior.executable = runConfig->remoteExecutableFilePath(); + params.symbolFile = runConfig->localExecutableFilePath(); params.remoteChannel = device->sshParameters().host + QLatin1String(":-1"); params.remoteSetupNeeded = true; params.closeMode = KillAtClose; |