Merge remote branch 'origin/2.2'

Conflicts: qtcreator.pri src/plugins/projectexplorer/toolchainmanager.cpp
2011-03-28 11:40:45 +02:00
parent 4bc1b19da7 3a75137acd
commit 3de823ca62
72 changed files with 941 additions and 389 deletions
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1292,6 +1292,16 @@ unsigned DebuggerEngine::debuggerCapabilities() const
    return 0;
 }

+bool DebuggerEngine::canWatchWidgets() const
+{
+    return false;
+}
+
+bool DebuggerEngine::acceptsWatchesWhileRunning() const
+{
+    return false;
+}
+
 bool DebuggerEngine::isSynchronous() const
 {
    return false;