diff options
author | hjk <qtc-committer@nokia.com> | 2010-11-23 13:44:37 +0100 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2010-11-23 13:45:18 +0100 |
commit | ba811dfb7171efd94ae67687be97fd02b7fa5e07 (patch) | |
tree | ba94e6ffe8b14a02da0530a5f0ae5954541d859e /src/plugins/debugger/debuggerplugin.cpp | |
parent | 790648b9154ae7b67d41d8fb564944bc275737b1 (diff) | |
download | qt-creator-ba811dfb7171efd94ae67687be97fd02b7fa5e07.tar.gz |
debugger: make watchers visible after project load again
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
-rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 57 |
1 files changed, 34 insertions, 23 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index cab0f62cc6..8289e416fc 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -467,6 +467,37 @@ void AttachRemoteParameters::clear() attachTarget.clear(); } + +/////////////////////////////////////////////////////////////////////// +// +// DummyEngine +// +/////////////////////////////////////////////////////////////////////// + +class DummyEngine : public DebuggerEngine +{ + Q_OBJECT + +public: + DummyEngine() : DebuggerEngine(DebuggerStartParameters()) {} + virtual ~DummyEngine() {} + + virtual void setupEngine() {} + virtual void setupInferior() {} + virtual void runEngine() {} + virtual void shutdownEngine() {} + virtual void shutdownInferior() {} + virtual void executeDebuggerCommand(const QString &) {} + virtual unsigned debuggerCapabilities() const { return 0; } +}; + +static DebuggerEngine *dummyEngine() +{ + static DummyEngine dummy; + return &dummy; +} + + /////////////////////////////////////////////////////////////////////// // // DebugMode @@ -2463,30 +2494,10 @@ void DebuggerPluginPrivate::startDebugger(RunControl *rc) } -class DummyEngine : public DebuggerEngine -{ - Q_OBJECT - -public: - DummyEngine() : DebuggerEngine(DebuggerStartParameters()) {} - virtual ~DummyEngine() {} - - virtual void setupEngine() {} - virtual void setupInferior() {} - virtual void runEngine() {} - virtual void shutdownEngine() {} - virtual void shutdownInferior() {} - virtual void executeDebuggerCommand(const QString &) {} - virtual unsigned debuggerCapabilities() const { return 0; } -}; - - void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine) { - static DummyEngine dummyEngine; - if (!engine) - engine = &dummyEngine; + engine = dummyEngine(); if (m_currentEngine == engine) return; @@ -2914,7 +2925,7 @@ void DebuggerPluginPrivate::activateDebugMode() void DebuggerPluginPrivate::sessionLoaded() { m_breakHandler->loadSessionData(); - WatchHandler::loadSessionData(); + dummyEngine()->watchHandler()->loadSessionData(); synchronizeWatchers(); } @@ -2931,7 +2942,7 @@ void DebuggerPluginPrivate::aboutToUnloadSession() void DebuggerPluginPrivate::aboutToSaveSession() { - WatchHandler::saveSessionData(); + dummyEngine()->watchHandler()->loadSessionData(); m_breakHandler->saveSessionData(); } |