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/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -71,6 +71,7 @@ private: ////////// General Interface //////////

    virtual void handleGdbStartFailed();
    void notifyInferiorSetupFailed() override;
+    void prepareForRestart() override;

    bool hasCapability(unsigned) const override;
    void detachDebugger() override;