diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 20:12:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 20:12:24 (GMT) |
| commit | 7795c14a574fcee67c840ce996602d61e66683f5 (patch) | |
| tree | 299a12bc79a827f8502f2f118b4254ceeaf1e7a0 /src/script/api/qscriptengine.cpp | |
| parent | ef0404ed32c2eee65cfca6137c2d9ebe67e1c5bd (diff) | |
| parent | a62045401cc8f55c3175a2b33e8f43b356604f37 (diff) | |
| download | Qt-7795c14a574fcee67c840ce996602d61e66683f5.zip Qt-7795c14a574fcee67c840ce996602d61e66683f5.tar.gz Qt-7795c14a574fcee67c840ce996602d61e66683f5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't run the QGL test on systems that does not have GL support.
Remove an useless assert from comp_func_SourceOver_sse2()
QScriptEngineAgent: recompile all the function when installing a debugger.
QScriptDeclarativeObject: we need to save the current stack pointer.
QScriptValue::objectId(): do not assert if the value is not a cell
Implement the composition mode "Plus" with SSE2
Clean the CompositionFunction tables of drawhelper
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 7bccffe..26673f4 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -4196,6 +4196,7 @@ void QScriptEngine::setAgent(QScriptEngineAgent *agent) "cannot set agent belonging to different engine"); return; } + QScript::APIShim shim(d); if (d->activeAgent) QScriptEngineAgentPrivate::get(d->activeAgent)->detach(); d->activeAgent = agent; |