summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-04-27 09:06:43 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-04-27 09:06:43 (GMT)
commitd17fb5cad878d1dbe144cfd7f02c6cb4d3db2677 (patch)
tree261ca3ad03972da54e1e4df2ef70d79015edc9aa /src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
parente26f32ef8e1480f80e362059cc03c4b5a7fb92e9 (diff)
parent001d46dffc6240da27634ef9e27b47f768587253 (diff)
downloadQt-d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677.zip
Qt-d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677.tar.gz
Qt-d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp')
-rw-r--r--src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp4
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);