diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-05 09:42:17 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-05 09:42:17 (GMT) |
| commit | 200afdbd684bc7b6dca96d6fccb59d4cd078a02e (patch) | |
| tree | c8b87ce527f9270a7773f44525208c60931a5759 /src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp | |
| parent | 226baa99f53eeeff2489148c9187c19f5bc86f0e (diff) | |
| parent | 5eef8717c9862befe8b6529cbb111c0b30529f48 (diff) | |
| download | Qt-200afdbd684bc7b6dca96d6fccb59d4cd078a02e.zip Qt-200afdbd684bc7b6dca96d6fccb59d4cd078a02e.tar.gz Qt-200afdbd684bc7b6dca96d6fccb59d4cd078a02e.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
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); |