diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
| commit | db9837fa6c9401e898ac8e7492081a6e21c71790 (patch) | |
| tree | d542a089711257402ac4fe70813fa0e7de825f2e /src/plugins/debugger/debuggerplugin.cpp | |
| parent | 7bc14bf3498ea6b1c19abacf85a5103772da26bc (diff) | |
| parent | 58747b2de107e8f6ac00daeb431ecbf3e603fd34 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/clangtools/clangtoolruncontrol.cpp
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 5ff1a89812..3c94e2339b 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1188,7 +1188,7 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it, kit = KitManager::kit(Utils::equal(&Kit::displayName, val)); } else if (key == "server") { startMode = AttachToRemoteServer; - remoteChannel = remoteChannel; + remoteChannel = val; } else if (key == "core") { startMode = AttachCore; coreFile = val; |