summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptcompletiontask.cpp
diff options
context:
space:
mode:
authorWater-Team <water@pad.test.qt.nokia.com>2011-08-31 23:00:13 (GMT)
committerWater-Team <water@pad.test.qt.nokia.com>2011-08-31 23:00:13 (GMT)
commitaa31031ca88d8db0c1c997d50fb789dbe0cb9b55 (patch)
treec3621fe5240e49fc1c260447b4d3cfbf453f07b6 /src/scripttools/debugging/qscriptcompletiontask.cpp
parent7fb04c5964e47e71b709a413be7839a3cedbba9e (diff)
parentf14bbde351d90bed520f9503500f922f7aa18c92 (diff)
downloadQt-aa31031ca88d8db0c1c997d50fb789dbe0cb9b55.zip
Qt-aa31031ca88d8db0c1c997d50fb789dbe0cb9b55.tar.gz
Qt-aa31031ca88d8db0c1c997d50fb789dbe0cb9b55.tar.bz2
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/scripttools/debugging/qscriptcompletiontask.cpp')
-rw-r--r--src/scripttools/debugging/qscriptcompletiontask.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripttools/debugging/qscriptcompletiontask.cpp b/src/scripttools/debugging/qscriptcompletiontask.cpp
index fb250b7..3c94a21 100644
--- a/src/scripttools/debugging/qscriptcompletiontask.cpp
+++ b/src/scripttools/debugging/qscriptcompletiontask.cpp
@@ -172,7 +172,7 @@ void QScriptCompletionTaskPrivate::completeScriptExpression()
while ((pos > 0) && isIdentChar(contents.at(pos-1)))
--pos;
int pos2 = cursorPosition - 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);
position = pos;