diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
commit | 34679dd23213881a9632e21e4858377ff90a9006 (patch) | |
tree | deb9ebf681d4954b2d44858ca1a14d251c31e8eb /src/3rdparty/webkit/JavaScriptCore/parser/SourceCode.h | |
parent | 7669f91c33328505fbe52f4913bd3f8745b76d31 (diff) | |
parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
src/corelib/io/qfilesystemwatcher_symbian_p.h
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 84360b84c..305b80444 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 { } |