diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-24 21:16:41 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-24 21:16:41 (GMT) |
| commit | fd5c6436d4be5ce6db57a8a34951c8ab4dac9000 (patch) | |
| tree | 2b2ce0df9cd0bfcc1c8a0566668c92df8be94206 /src/gui/text | |
| parent | 117b9bb3d576d9974b3d05174d1fccf98e47cb22 (diff) | |
| parent | 5f5cf5b798cc7e65e47987b654beaf9d762406eb (diff) | |
| download | Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.zip Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.gz Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tests/auto/qsqldatabase/tst_databases.h
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 829ac12..407fcb6 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2210,6 +2210,7 @@ bool QTextEngine::atWordSeparator(int position) const case '\'': case '"': case '~': + case '|': return true; default: return false; |