diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-06 10:07:16 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-06 10:07:39 +0200 |
| commit | 4b35a36ca088a79c1aac877d3259e8a981399ee9 (patch) | |
| tree | fc233cc0f2aa9e6de91b9d95037d218327cc0cc9 /src/gui/text/qtextobject.cpp | |
| parent | 1d9a18142eb19d5dde93b7e5c63f9be0e4caf896 (diff) | |
| parent | 718013958724210915b24142c499154f751f0bac (diff) | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/painting/qpainterpath.cpp
src/gui/text/qfontengine_ft.cpp
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
| -rw-r--r-- | src/gui/text/qtextobject.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 5c1c8b9edc..4e8b8ca279 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -891,11 +891,6 @@ QTextBlockUserData::~QTextBlockUserData() Returns true if this text block is valid; otherwise returns false. */ -bool QTextBlock::isValid() const -{ - return p != 0 && p->blockMap().isValid(n); -} - /*! \fn QTextBlock &QTextBlock::operator=(const QTextBlock &other) @@ -1493,7 +1488,7 @@ QTextBlock::iterator QTextBlock::end() const */ QTextBlock QTextBlock::next() const { - if (!isValid()) + if (!isValid() || !p->blockMap().isValid(n)) return QTextBlock(); return QTextBlock(p, p->blockMap().next(n)); |