1 files changed, 11 insertions, 3 deletions
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h
index 195006b130..1c4edc4329 100644
--- a/src/gui/text/qtextdocument_p.h
+++ b/src/gui/text/qtextdocument_p.h
@@ -29,7 +29,9 @@
 #include "QtCore/qurl.h"
 #include "QtCore/qvariant.h"
 
+#if QT_CONFIG(cssparser)
 #include "private/qcssparser_p.h"
+#endif
 #include "private/qfragmentmap_p.h"
 #include "private/qobject_p.h"
 #include "private/qtextformat_p.h"
@@ -140,7 +142,9 @@ public:
 
     void setLayout(QAbstractTextDocumentLayout *layout);
 
-    void insert(int pos, const QString &text, int format);
+    void insert(int pos, QStringView text, int format);
+    void insert(int pos, QChar c, int format)
+    { insert(pos, QStringView(&c, 1), format); }
     void insert(int pos, int strPos, int strLength, int format);
     int insertBlock(int pos, int blockFormat, int charFormat, QTextUndoCommand::Operation = QTextUndoCommand::MoveCursor);
     int insertBlock(QChar blockSeparator, int pos, int blockFormat, int charFormat,
@@ -243,8 +247,8 @@ private:
 public:
     void documentChange(int from, int length);
 
-    inline void addCursor(QTextCursorPrivate *c) { cursors.insert(c); }
-    inline void removeCursor(QTextCursorPrivate *c) { cursors.remove(c); }
+    void addCursor(QTextCursorPrivate *c);
+    void removeCursor(QTextCursorPrivate *c);
 
     QTextFrame *frameAt(int pos) const;
     QTextFrame *rootFrame() const;
@@ -291,6 +295,8 @@ public:
         return get(object->document());
     }
 
+    bool canLayout() const { return layoutEnabled && !pageSize.isNull(); }
+
 private:
     QTextDocumentPrivate(const QTextDocumentPrivate& m);
     QTextDocumentPrivate& operator= (const QTextDocumentPrivate& m);
@@ -337,6 +343,7 @@ private:
 
 public:
     bool inContentsChange;
+    bool layoutEnabled = true;
     QTextOption defaultTextOption;
     Qt::CursorMoveStyle defaultCursorMoveStyle;
 #ifndef QT_NO_CSSPARSER
@@ -349,6 +356,7 @@ public:
     QString title;
     QString url;
     QString cssMedia;
+    QString frontMatter;
     qreal indentWidth;
     qreal documentMargin;
     QUrl baseUrl;