diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:43:44 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:43:44 (GMT) |
| commit | 788fd30f372cfa21a6d4cdd63526318c41b22b6d (patch) | |
| tree | b1d82e77ee04ee50b24298ae58f46c0980ec0e5d /src/scripttools/debugging/qscriptdebuggerbackend.cpp | |
| parent | fb869402dd5d061d1e5257f3c4b25d28ab9428a5 (diff) | |
| parent | 13f703741dee67adc7d92e4bcf525431334c9a60 (diff) | |
| download | Qt-788fd30f372cfa21a6d4cdd63526318c41b22b6d.zip Qt-788fd30f372cfa21a6d4cdd63526318c41b22b6d.tar.gz Qt-788fd30f372cfa21a6d4cdd63526318c41b22b6d.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerbackend.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggerbackend.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggerbackend.cpp b/src/scripttools/debugging/qscriptdebuggerbackend.cpp index 24a3847..3c29130 100644 --- a/src/scripttools/debugging/qscriptdebuggerbackend.cpp +++ b/src/scripttools/debugging/qscriptdebuggerbackend.cpp @@ -615,13 +615,11 @@ void QScriptDebuggerBackend::doPendingEvaluate(bool postEvent) // push a new context and initialize its scope chain etc. { QScriptContext *evalContext = engine()->pushContext(); -#if QT_VERSION >= 0x040500 QScriptValueList scopeChain = ctx->scopeChain(); if (scopeChain.isEmpty()) scopeChain.append(engine()->globalObject()); while (!scopeChain.isEmpty()) evalContext->pushScope(scopeChain.takeLast()); -#endif evalContext->setActivationObject(ctx->activationObject()); evalContext->setThisObject(ctx->thisObject()); } |