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/qscriptdebuggercommandexecutor.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/qscriptdebuggercommandexecutor.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp index e36386d..1be8c5f 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp @@ -287,13 +287,9 @@ QScriptDebuggerResponse QScriptDebuggerCommandExecutor::execute( QScriptContext *ctx = backend->context(command.contextIndex()); if (ctx) { QScriptDebuggerValueList dest; -#if QT_VERSION >= 0x040500 QScriptValueList src = ctx->scopeChain(); for (int i = 0; i < src.size(); ++i) dest.append(src.at(i)); -#else - dest.append(ctx->activationObject()); -#endif response.setResult(dest); } else { response.setError(QScriptDebuggerResponse::InvalidContextIndex); |