diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-01 00:59:47 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-01 00:59:47 (GMT) |
| commit | 05ddcb4d40a56878e45bf6a06dd178217fa534f1 (patch) | |
| tree | bbce506301799e4767a7ebb347286052da7512de /src/scripttools/debugging/qscriptcompletiontask.cpp | |
| parent | 6e0e3c7312bbceef69e61b745d88076224745a33 (diff) | |
| parent | 1092ef425b9ed5835e4863c5ec32f9fc21af8d4d (diff) | |
| download | Qt-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/qscriptcompletiontask.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptcompletiontask.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/scripttools/debugging/qscriptcompletiontask.cpp b/src/scripttools/debugging/qscriptcompletiontask.cpp index 3767505..119b96a 100644 --- a/src/scripttools/debugging/qscriptcompletiontask.cpp +++ b/src/scripttools/debugging/qscriptcompletiontask.cpp @@ -162,11 +162,7 @@ void QScriptCompletionTaskPrivate::completeScriptExpression() obj = ctx->thisObject(); } else { QScriptValueList scopeChain; -#if QT_VERSION >= 0x040500 scopeChain = ctx->scopeChain(); -#else - scopeChain.append(ctx->activationObject()); -#endif for (int i = 0; i < scopeChain.size(); ++i) { QScriptValue oo = scopeChain.at(i).property(topLevelIdent); if (oo.isObject()) { @@ -180,11 +176,7 @@ void QScriptCompletionTaskPrivate::completeScriptExpression() if (obj.isValid()) objects.append(obj); } else { -#if QT_VERSION >= 0x040500 objects << ctx->scopeChain(); -#else - objects.append(ctx->activationObject()); -#endif QStringList keywords; keywords.append(QString::fromLatin1("this")); keywords.append(QString::fromLatin1("true")); |