Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 6 insertions, 2 deletions

diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index 7be114adf9..ed23a4d8d9 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -2088,8 +2088,12 @@ void QTextDocumentLayoutPrivate::drawBlock(const QPointF &offset, QPainter *pain
 
     tl->draw(painter, offset, selections, context.clip.isValid() ? (context.clip & clipRect) : clipRect);
 
-    if ((context.cursorPosition >= blpos && context.cursorPosition < blpos + bllen)
-        || (context.cursorPosition < -1 && !tl->preeditAreaText().isEmpty())) {
+    // if the block is empty and it precedes a table, do not draw the cursor.
+    // the cursor is drawn later after the table has been drawn so no need
+    // to draw it here.
+    if (!isEmptyBlockBeforeTable(frameIteratorForTextPosition(blpos))
+        && ((context.cursorPosition >= blpos && context.cursorPosition < blpos + bllen)
+            || (context.cursorPosition < -1 && !tl->preeditAreaText().isEmpty()))) {
         int cpos = context.cursorPosition;
         if (cpos < -1)
             cpos = tl->preeditAreaPosition() - (cpos + 2);