diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-14 07:45:44 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-14 07:45:44 (GMT) |
| commit | 1b30b3a6726adf806ae221357393e562285e8346 (patch) | |
| tree | c650ff836d3abdf5890726354ee6e2b9bce11304 /src/scripttools/debugging/qscriptdebuggercodeview.cpp | |
| parent | 1c1a5fe0e2d9e28be5e0e14732d79d34c9bb2a74 (diff) | |
| parent | 704dd92581783d91ccd234d58896d7078eed14a5 (diff) | |
| download | Qt-1b30b3a6726adf806ae221357393e562285e8346.zip Qt-1b30b3a6726adf806ae221357393e562285e8346.tar.gz Qt-1b30b3a6726adf806ae221357393e562285e8346.tar.bz2 | |
Merge remote branch 'origin/4.8' into 4.8-from-4.7
Conflicts:
src/gui/text/qtextengine_p.h
src/network/ssl/qsslsocket_openssl.cpp
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercodeview.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggercodeview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggercodeview.cpp b/src/scripttools/debugging/qscriptdebuggercodeview.cpp index 7c99723..65fd366 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeview.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodeview.cpp @@ -233,7 +233,7 @@ bool QScriptDebuggerCodeView::event(QEvent *e) return false; } int pos2 = linePosition - 1; - while ((pos2 < contents.size()-1) && isIdentChar(contents.at(pos2+1))) + while ((pos2+1 < contents.size()) && isIdentChar(contents.at(pos2+1))) ++pos2; QString ident = contents.mid(pos, pos2 - pos + 1); |