Remove Qt3 compat leftovers

Change-Id: I91c3d26125168998d6279bddb0671cfb68eac2f4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index bef461f..8246722 100644 (file)
--- 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;