diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-10 11:14:55 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-10 11:14:55 (GMT) |
| commit | 03dba6aa6d3a4738d2ff63feabff94cec1c1e5cd (patch) | |
| tree | e03b32d1daeae2dc89159cc2bd7a63702a9d7965 /src/gui/text | |
| parent | 6e6bdedd06c72f857590b32462548448da6d59b5 (diff) | |
| parent | 64852122ba71bbb297b4f1e440f6fabee16ca2fe (diff) | |
| download | Qt-03dba6aa6d3a4738d2ff63feabff94cec1c1e5cd.zip Qt-03dba6aa6d3a4738d2ff63feabff94cec1c1e5cd.tar.gz Qt-03dba6aa6d3a4738d2ff63feabff94cec1c1e5cd.tar.bz2 | |
Merge branch 'graphics-team-text-4.7' into 4.7
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qtextobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index ea2ef2d..4b92379 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -1488,7 +1488,7 @@ QTextBlock::iterator QTextBlock::end() const */ QTextBlock QTextBlock::next() const { - if (!p) + if (!isValid()) return QTextBlock(); return QTextBlock(p, p->blockMap().next(n)); @@ -1504,7 +1504,7 @@ QTextBlock QTextBlock::next() const */ QTextBlock QTextBlock::previous() const { - if (!p) + if (!isValid()) return QTextBlock(); return QTextBlock(p, p->blockMap().previous(n)); |