summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextengine_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
-rw-r--r--src/gui/text/qtextengine_p.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index bef461f448..82467229eb 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -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;