diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-26 12:35:45 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-26 12:35:45 (GMT) |
| commit | 7e30c92186878beb300a13093c3668ae8a10f2be (patch) | |
| tree | 313aa7f7a8345e65b7803bae1cb68ad866bdadbc /src/3rdparty/webkit/JavaScriptCore/parser/SourceCode.h | |
| parent | b98042831f4f6f6c5844965731b2dd64f27c076e (diff) | |
| parent | aeb4251c76560a070ce22320be00e860950b4668 (diff) | |
| download | Qt-7e30c92186878beb300a13093c3668ae8a10f2be.zip Qt-7e30c92186878beb300a13093c3668ae8a10f2be.tar.gz Qt-7e30c92186878beb300a13093c3668ae8a10f2be.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/parser/SourceCode.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/parser/SourceCode.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/SourceCode.h b/src/3rdparty/webkit/JavaScriptCore/parser/SourceCode.h index 84360b8..305b804 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/SourceCode.h +++ b/src/3rdparty/webkit/JavaScriptCore/parser/SourceCode.h @@ -47,7 +47,11 @@ namespace JSC { : m_provider(provider) , m_startChar(0) , m_endChar(m_provider->length()) +#ifdef QT_BUILD_SCRIPT_LIB + , m_firstLine(firstLine) +#else , m_firstLine(std::max(firstLine, 1)) +#endif { } @@ -55,7 +59,11 @@ namespace JSC { : m_provider(provider) , m_startChar(start) , m_endChar(end) +#ifdef QT_BUILD_SCRIPT_LIB + , m_firstLine(firstLine) +#else , m_firstLine(std::max(firstLine, 1)) +#endif { } |