Merge remote-tracking branch 'origin/4.0'

Change-Id: I89c52ca2145a43c94d3366367ba72fde605dd577
2016-05-31 12:01:58 +02:00
parent a6683575c4 7d51d3849a
commit 73bb92c5a6
23 changed files with 148 additions and 95 deletions
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -204,6 +204,7 @@ public:
    virtual void selectWatchData(const QByteArray &iname);

    virtual void startDebugger(DebuggerRunControl *runControl);
+    virtual void prepareForRestart() {}

    virtual void watchPoint(const QPoint &);