summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-05-01 00:59:47 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-05-01 00:59:47 (GMT)
commit05ddcb4d40a56878e45bf6a06dd178217fa534f1 (patch)
treebbce506301799e4767a7ebb347286052da7512de /src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
parent6e0e3c7312bbceef69e61b745d88076224745a33 (diff)
parent1092ef425b9ed5835e4863c5ec32f9fc21af8d4d (diff)
downloadQt-05ddcb4d40a56878e45bf6a06dd178217fa534f1.zip
Qt-05ddcb4d40a56878e45bf6a06dd178217fa534f1.tar.gz
Qt-05ddcb4d40a56878e45bf6a06dd178217fa534f1.tar.bz2
Merge branch 'shader-api' into gl2engine-new-shaders
Conflicts: src/opengl/opengl.pro src/opengl/qglextensions.cpp src/opengl/qglextensions_p.h src/opengl/qglshaderprogram.cpp src/opengl/qglshaderprogram.h
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);