diff options
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
-rw-r--r-- | src/gui/text/qtextengine_p.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index bef461f448..aff5e1cb7f 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -390,7 +390,7 @@ struct Q_AUTOTEST_EXPORT QScriptLine mutable uint gridfitted : 1; uint hasTrailingSpaces : 1; uint leadingIncluded : 1; - QFixed height() const { return (ascent + descent).ceil() + QFixed height() const { return ascent + descent + (leadingIncluded? qMax(QFixed(),leading) : QFixed()); } QFixed base() const { return ascent + (leadingIncluded ? qMax(QFixed(),leading) : QFixed()); } @@ -540,24 +540,14 @@ public: int findItem(int strPos) const; inline QTextFormatCollection *formats() const { -#ifdef QT_BUILD_COMPAT_LIB - return 0; // Compat should never reference this symbol -#else if (block.docHandle()) return block.docHandle()->formatCollection(); - else if (specialData) - return specialData->formats.data(); - - return 0; -#endif + return specialData ? specialData->formats.data() : 0; } QTextCharFormat format(const QScriptItem *si) const; inline QAbstractTextDocumentLayout *docLayout() const { -#ifdef QT_BUILD_COMPAT_LIB - return 0; // Compat should never reference this symbol -#else + Q_ASSERT(block.docHandle()); return block.docHandle()->document()->documentLayout(); -#endif } int formatIndex(const QScriptItem *si) const; |