Merge remote-tracking branch 'origin/3.5'

Change-Id: I65968dd02ea6bdd15f304ae567dd0c02238e6949

src/plugins/debugger/watchhandler.h

@@ -112,6 +112,7 @@ public:
 
     void cleanup();
     void watchExpression(const QString &exp, const QString &name = QString());
+    void updateWatchExpression(WatchItem *item, const QByteArray &newExp);
     void watchVariable(const QString &exp);
     Q_SLOT void clearWatches();