diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-23 13:16:51 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-23 13:16:51 (GMT) |
| commit | 902ceabbca3cd3f3a06180aba64b0f81b3f1dba4 (patch) | |
| tree | 64efeee683cd31c2a0f7511fecc3c124c91249fe /src/3rdparty/webkit/JavaScriptCore/runtime/ScopeChain.cpp | |
| parent | 9161598b9cb374889ca6c69831c035c1eaa4d56e (diff) | |
| parent | bbcef4e4b596324aeda80e0aa7d313c586454740 (diff) | |
| download | Qt-902ceabbca3cd3f3a06180aba64b0f81b3f1dba4.zip Qt-902ceabbca3cd3f3a06180aba64b0f81b3f1dba4.tar.gz Qt-902ceabbca3cd3f3a06180aba64b0f81b3f1dba4.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Conflicts:
demos/embedded/fluidlauncher/config_s60/config.xml
demos/embedded/fluidlauncher/fluidlauncher.pro
src/corelib/io/io.pri
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qwidget_s60.cpp
src/s60installs/qt_libs.pro
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/ScopeChain.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/ScopeChain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/ScopeChain.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/ScopeChain.cpp index 5c2edab..960c525 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/ScopeChain.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/ScopeChain.cpp @@ -56,7 +56,7 @@ int ScopeChain::localDepth() const int scopeDepth = 0; ScopeChainIterator iter = this->begin(); ScopeChainIterator end = this->end(); - while (!(*iter)->isObject(&JSActivation::info)) { + while (!(*iter)->inherits(&JSActivation::info)) { ++iter; if (iter == end) break; |