Merge remote-tracking branch 'origin/2.2'

Conflicts: src/plugins/debugger/breakhandler.cpp src/plugins/debugger/cdb/cdbengine.cpp
2011-05-16 17:32:23 +02:00
parent fcaa6b0d1b 5ded3e2f62
commit fa0127bedd
7 changed files with 9207 additions and 1155 deletions
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1492,7 +1492,7 @@ void DebuggerPluginPrivate::startRemoteCdbSession()
                                           ProjectExplorer::Abi::WindowsOS,
                                           ProjectExplorer::Abi::WindowsMsvc2010Flavor,
                                           ProjectExplorer::Abi::PEFormat,
-                                           true);
+                                           hostAbi.wordWidth());
    sp.startMode = AttachToRemote;
    StartRemoteCdbDialog dlg(mainWindow());
    QString previousConnection = configValue(connectionKey).toString();