diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 11:21:11 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 11:21:11 +0100 |
| commit | 649e65519bef38948a818f282e3022d034dc80a5 (patch) | |
| tree | 9f4b1de9322e304efd003a1f8c03047327732557 /src/gui/text/qtextobject.cpp | |
| parent | bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c (diff) | |
| parent | fcdf5a5471b7cf1d2bc72855ed1f627c8d6f4fc4 (diff) | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
mkspecs/common/symbian/symbian.conf
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
| -rw-r--r-- | src/gui/text/qtextobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index c5b6e14a74..0081550366 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -1504,7 +1504,7 @@ QTextBlock QTextBlock::next() const */ QTextBlock QTextBlock::previous() const { - if (!isValid()) + if (!p) return QTextBlock(); return QTextBlock(p, p->blockMap().previous(n)); |