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

Merge branch '2.4' into 2.5

Browse Source
This commit is contained in:
Oswald Buddenhagen
2012-04-12 09:39:18 +02:00
parent 9eea4953e2 9471d96e57
commit b830703c9c
3 changed files with 669 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp
View File

@@ -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.