Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I963b5f48b5d6f3500ca379fbd7f1a4290b570175

1 files changed, 7 insertions, 5 deletions

diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.cpp b/src/plugins/platforms/windows/qwindowsinputcontext.cpp
index d5258ca6a3..079c25f9eb 100644
--- a/src/plugins/platforms/windows/qwindowsinputcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.cpp
@@ -280,13 +280,15 @@ void QWindowsInputContext::showInputPanel()
     // with Windows 10 if the Windows IME is (re)enabled _after_ the caret is shown.
     if (m_caretCreated) {
         cursorRectChanged();
-        // We only call ShowCaret() on Windows 10 as in earlier versions the caret
-        // would actually be visible (QTBUG-74492) and the workaround for the
-        // Surface seems unnecessary there anyway. But leave it hidden for IME.
-        if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10)
+        // We only call ShowCaret() on Windows 10 after 1703 as in earlier versions
+        // the caret would actually be visible (QTBUG-74492) and the workaround for
+        // the Surface seems unnecessary there anyway. But leave it hidden for IME.
+        if (QOperatingSystemVersion::current() >=
+            QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 16299)) {
             ShowCaret(platformWindow->handle());
-        else
+        } else {
             HideCaret(platformWindow->handle());
+        }
         setWindowsImeEnabled(platformWindow, false);
         setWindowsImeEnabled(platformWindow, true);
     }