diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:30:05 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:30:05 (GMT) |
| commit | 13f703741dee67adc7d92e4bcf525431334c9a60 (patch) | |
| tree | b1d82e77ee04ee50b24298ae58f46c0980ec0e5d /src/scripttools/debugging/qscriptdebugger.cpp | |
| parent | a29ede629a18f9e107bae5e9ca03059a66f25de5 (diff) | |
| parent | bff689f3c5b127add96c50e4b2fdb2eadbf498a9 (diff) | |
| download | Qt-13f703741dee67adc7d92e4bcf525431334c9a60.zip Qt-13f703741dee67adc7d92e4bcf525431334c9a60.tar.gz Qt-13f703741dee67adc7d92e4bcf525431334c9a60.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/scripttools/debugging/qscriptdebugger.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebugger.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp index 5a356ae..ce43572 100644 --- a/src/scripttools/debugging/qscriptdebugger.cpp +++ b/src/scripttools/debugging/qscriptdebugger.cpp @@ -663,11 +663,7 @@ QString QScriptDebuggerPrivate::toolTip(int frameIndex, int lineNumber, objects.append(ctx->thisObject()); ++pathIndex; } else { -#if QT_VERSION >= 0x040500 objects << ctx->scopeChain(); -#else - objects.append(ctx->activationObject()); -#endif } for (int i = 0; i < objects.size(); ++i) { QScriptValue val = objects.at(i); @@ -991,13 +987,11 @@ public: qint64 scriptId = m_added.at(m_index); m_debugger->scriptsModel->addScript(scriptId, data); -#if QT_VERSION >= 0x040500 // ### could be slow, might want to do this in a separate thread QString xml = qt_scriptToXml(data.contents(), data.baseLineNumber()); QScriptXmlParser::Result extraInfo = QScriptXmlParser::parse(xml); m_debugger->scriptsModel->addExtraScriptInfo( scriptId, extraInfo.functionsInfo, extraInfo.executableLineNumbers); -#endif if (++m_index < m_added.size()) frontend.scheduleGetScriptData(m_added.at(m_index)); |