Merge remote-tracking branch 'origin/2.6'

src/plugins/debugger/debuggerplugin.cpp

@@ -1141,6 +1141,7 @@ public slots:
             int line, column;
             exp = cppExpressionAt(textEditor, tc.position(), &line, &column);
         }
+        exp = fixCppExpression(exp);
         if (exp.isEmpty())
             return;
         currentEngine()->watchHandler()->watchExpression(exp);