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/qscriptcompletiontask.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/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")); |