diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 09:39:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 09:39:18 +0200 |
| commit | b830703c9ce9228caf7e76286d5defdd7c035033 (patch) | |
| tree | 20af26473515a254134bc048ada8b6bf28d68aaa /share/qtcreator/qml/qmljsdebugger | |
| parent | 9eea4953e27a14ddbff8768b511376d3b85aa051 (diff) | |
| parent | 9471d96e572c527bf85a2ca82ebd49bbf6f3c162 (diff) | |
| download | qt-creator-b830703c9ce9228caf7e76286d5defdd7c035033.tar.gz | |
Merge branch '2.4' into 2.5
Diffstat (limited to 'share/qtcreator/qml/qmljsdebugger')
| -rw-r--r-- | share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp b/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp index 0ad497d90f..b98a144ce8 100644 --- a/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp +++ b/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp @@ -280,13 +280,19 @@ JSDebuggerAgent::JSDebuggerAgent(QScriptEngine *engine) : QDeclarativeDebugService("JSDebugger") , QScriptEngineAgent(engine) , d(new JSDebuggerAgentPrivate(this)) -{} +{ + if (status() == Enabled) + engine->setAgent(this); +} JSDebuggerAgent::JSDebuggerAgent(QDeclarativeEngine *engine) : QDeclarativeDebugService("JSDebugger") , QScriptEngineAgent(QDeclarativeDebugHelper::getScriptEngine(engine)) , d(new JSDebuggerAgentPrivate(this)) -{} +{ + if (status() == Enabled) + QDeclarativeDebugHelper::getScriptEngine(engine)->setAgent(this); +} /*! Destroys this QScriptDebuggerAgent. |