diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-01 21:38:09 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-01 21:38:09 (GMT) |
| commit | 1d021032f6920fe90bc23a028ae15ab434868363 (patch) | |
| tree | d03fbde992158177aeb22d83e0412c58f189197b /tests/auto/selftests | |
| parent | 36a5ecba6ca65e8445fa9b391e239f62c2002159 (diff) | |
| parent | fef0ec67bf1b49221b3f383f6ea1c9a65fc08c57 (diff) | |
| download | Qt-1d021032f6920fe90bc23a028ae15ab434868363.zip Qt-1d021032f6920fe90bc23a028ae15ab434868363.tar.gz Qt-1d021032f6920fe90bc23a028ae15ab434868363.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Diffstat (limited to 'tests/auto/selftests')
| -rw-r--r-- | tests/auto/selftests/tst_selftests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp index 0cff2fd..0818b4c 100644 --- a/tests/auto/selftests/tst_selftests.cpp +++ b/tests/auto/selftests/tst_selftests.cpp @@ -131,11 +131,11 @@ static QList<QByteArray> splitLines(QByteArray ba) if (index == -1) { continue; } - int end = line.indexOf('"', index + strlen(markers[j][0]) + 1); + int end = line.indexOf('"', index + strlen(markers[j][0])); if (end == -1) { continue; } - line.replace(index, end-index, markers[j][1]); + line.replace(index, end-index + 1, markers[j][1]); } } |