feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: re-do state transitions in combined C++/Qml engine

Browse Source 
This still needs a lot of work and sanitizing.
This commit is contained in:
hjk
2011-01-14 14:25:02 +01:00
parent adf74394bb
commit 7195c6b5ad
7 changed files with 463 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/debuggerengine.h
View File

@@ -241,6 +241,7 @@ public:
virtual void updateViews();
bool isSlaveEngine() const;
bool isMasterEngine() const;
DebuggerEngine *masterEngine() const;
signals:
@@ -320,7 +321,7 @@ protected:
virtual void frameUp();
virtual void frameDown();
DebuggerRunControl *runControl() const; // FIXME: Protect.
DebuggerRunControl *runControl() const;
static QString msgWatchpointTriggered(BreakpointId id,
int number, quint64 address);
@@ -338,12 +339,18 @@ protected:
static bool isCppBreakpoint(const Internal::BreakpointParameters &p);
bool isStateDebugging() const;
void setStateDebugging(bool on);
private:
// Wrapper engine needs access to state of its subengines.
friend class Internal::QmlCppEngine;
friend class Internal::DebuggerPluginPrivate;
void setState(DebuggerState state, bool forced = false);
virtual void setState(DebuggerState state, bool forced = false);
virtual void setSilentState(DebuggerState state);
virtual void slaveEngineStateChanged(DebuggerEngine *engine,
DebuggerState state);
friend class DebuggerEnginePrivate;
DebuggerEnginePrivate *d;