diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 02:06:35 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 02:06:35 +1000 |
commit | 163a4a4c38453cd4ed32c5a436763e11ce580687 (patch) | |
tree | c9162f4b47571300ea17578401122532139561e9 /src/gui/text/qtextobject.cpp | |
parent | 7190c7be34fe0dbcfbb10b232b40977c758d251a (diff) | |
parent | b6f1dd4151c5bbcb7d4367ec972c9026ab9e68be (diff) |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
-rw-r--r-- | src/gui/text/qtextobject.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 0081550366..9139561f53 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -891,6 +891,11 @@ 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) |