1 files changed, 44 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 02475eb431..61cac47370 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -167,6 +167,7 @@ private slots:
     void openInputPanel();
     void setHAlignClearCache();
     void focusOutClearSelection();
+    void focusOutNotClearSelection();
 
     void echoMode();
     void passwordEchoDelay();
@@ -3497,6 +3498,49 @@ void tst_qquicktextinput::focusOutClearSelection()
     QTRY_COMPARE(input.selectedText(), QLatin1String(""));
 }
 
+void tst_qquicktextinput::focusOutNotClearSelection()
+{
+    QQuickView view;
+    QQuickTextInput input;
+    input.setText(QLatin1String("Hello world"));
+    input.setFocus(true);
+    input.setParentItem(view.contentItem());
+    input.componentComplete();
+    view.show();
+    view.requestActivate();
+    QTest::qWaitForWindowActive(&view);
+
+    QVERIFY(input.hasActiveFocus());
+    input.select(2,5);
+    QTRY_COMPARE(input.selectedText(), QLatin1String("llo"));
+
+    // The selection should not be cleared when the focus
+    // out event has one of the following reason:
+    // Qt::ActiveWindowFocusReason
+    // Qt::PopupFocusReason
+
+    input.setFocus(false, Qt::ActiveWindowFocusReason);
+    QGuiApplication::processEvents();
+    QTRY_COMPARE(input.selectedText(), QLatin1String("llo"));
+    QTRY_COMPARE(input.hasActiveFocus(), false);
+
+    input.setFocus(true);
+    QTRY_COMPARE(input.hasActiveFocus(), true);
+
+    input.setFocus(false, Qt::PopupFocusReason);
+    QGuiApplication::processEvents();
+    QTRY_COMPARE(input.selectedText(), QLatin1String("llo"));
+    QTRY_COMPARE(input.hasActiveFocus(), false);
+
+    input.setFocus(true);
+    QTRY_COMPARE(input.hasActiveFocus(), true);
+
+    input.setFocus(false, Qt::OtherFocusReason);
+    QGuiApplication::processEvents();
+    QTRY_COMPARE(input.selectedText(), QLatin1String(""));
+    QTRY_COMPARE(input.hasActiveFocus(), false);
+}
+
 void tst_qquicktextinput::geometrySignals()
 {
     QQmlComponent component(&engine, testFileUrl("geometrySignals.qml"));