1 files changed, 16 insertions, 6 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index 571563d29a..52eb4e4078 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -112,7 +112,7 @@ static QTextLine currentTextLine(const QTextCursor &cursor)
 }
 
 QWidgetTextControlPrivate::QWidgetTextControlPrivate()
-    : doc(0), cursorOn(false), blinkingEnabled(false), cursorIsFocusIndicator(false),
+    : doc(0), cursorOn(false), blinkingEnabled(true), cursorVisible(false), cursorIsFocusIndicator(false),
 #ifndef Q_OS_ANDROID
       interactionFlags(Qt::TextEditorInteraction),
 #else
@@ -685,6 +685,16 @@ void QWidgetTextControlPrivate::_q_documentLayoutChanged()
 
 }
 
+void QWidgetTextControlPrivate::setCursorVisible(bool visible)
+{
+    if (cursorVisible == visible)
+        return;
+
+    cursorVisible = visible;
+
+    updateCursorBlinking();
+}
+
 void QWidgetTextControlPrivate::setBlinkingCursorEnabled(bool enable)
 {
     if (blinkingEnabled == enable)
@@ -703,13 +713,13 @@ void QWidgetTextControlPrivate::setBlinkingCursorEnabled(bool enable)
 void QWidgetTextControlPrivate::updateCursorBlinking()
 {
     cursorBlinkTimer.stop();
-    if (blinkingEnabled) {
+    if (cursorVisible && blinkingEnabled) {
         int flashTime = QGuiApplication::styleHints()->cursorFlashTime();
         if (flashTime >= 2)
             cursorBlinkTimer.start(flashTime / 2, q_func());
     }
 
-    cursorOn = true;
+    cursorOn = cursorVisible;
     repaintCursor();
 }
 
@@ -2170,13 +2180,13 @@ void QWidgetTextControlPrivate::focusEvent(QFocusEvent *e)
 #endif
         cursorOn = (interactionFlags & (Qt::TextSelectableByKeyboard | Qt::TextEditable));
         if (interactionFlags & Qt::TextEditable) {
-            setBlinkingCursorEnabled(true);
+            setCursorVisible(true);
         }
 #ifdef QT_KEYPAD_NAVIGATION
         }
 #endif
     } else {
-        setBlinkingCursorEnabled(false);
+        setCursorVisible(false);
 
         if (cursorIsFocusIndicator
             && e->reason() != Qt::ActiveWindowFocusReason
@@ -2985,7 +2995,7 @@ void QWidgetTextControl::setTextInteractionFlags(Qt::TextInteractionFlags flags)
     d->interactionFlags = flags;
 
     if (d->hasFocus)
-        d->setBlinkingCursorEnabled(flags & Qt::TextEditable);
+        d->setCursorVisible(flags & Qt::TextEditable);
 }
 
 Qt::TextInteractionFlags QWidgetTextControl::textInteractionFlags() const