Merge commit 'origin/1.3'

Conflicts: src/plugins/cpptools/cppcodecompletion.h src/plugins/debugger/gdb/gdbengine.cpp src/plugins/qmleditor/QmlEditor.pluginspec
2009-10-26 13:51:56 +01:00
parent 4504aec7de 3c0ca8c188
commit 441ece365a
138 changed files with 4799 additions and 2432 deletions
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -216,6 +216,7 @@ static const char *stateName(int s)
 DebuggerStartParameters::DebuggerStartParameters()
  : attachPID(-1),
    useTerminal(false),
+    remoteChannelType(-1),
    toolChainType(ProjectExplorer::ToolChain::UNKNOWN),
    startMode(NoStartMode)
 {}