Revert symbol addition in b033bb9

Because it breaks forward compatibility. We will use the original
fix in 4.8. In 4.7 we just make sure it doesn't crash in
QTextBlock::next().

Reviewed-by: Thiago Macieira

1 files changed, 1 insertions, 6 deletions

diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index a403cc5f1c..2a93f67cfa 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));