Merge remote-tracking branch 'origin/8.0'

Change-Id: Icbb87ac8bcee5fb86042d3863a973573510651b4

src/plugins/texteditor/textdocumentlayout.h

@@ -236,6 +236,11 @@ public:
     void documentReloaded(TextMarks marks, TextDocument *baseextDocument);
     void updateMarksLineNumber();
     void updateMarksBlock(const QTextBlock &block);
+    void scheduleUpdate();
+    void requestUpdateNow();
+
+private:
+    bool m_updateScheduled = false;
 
 signals:
     void updateExtraArea();