2 files changed, 32 insertions, 2 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 8bad4bb176..54a3a85e87 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -148,6 +148,7 @@ private slots:
     void enableChooseButton();
     void hooks();
     void widgetlessNativeDialog();
+    void trailingDotsAndSpaces();
 #ifdef Q_OS_UNIX
 #ifdef QT_BUILD_INTERNAL
     void tildeExpansion_data();
@@ -1413,6 +1414,33 @@ void tst_QFiledialog::widgetlessNativeDialog()
     QVERIFY(!button);
 }
 
+void tst_QFiledialog::trailingDotsAndSpaces()
+{
+#ifndef Q_OS_WIN
+    QSKIP("This is only tested on Windows");
+#endif
+    QNonNativeFileDialog fd;
+    fd.setViewMode(QFileDialog::List);
+    fd.setFileMode(QFileDialog::ExistingFile);
+    fd.setOptions(QFileDialog::DontUseNativeDialog);
+    fd.show();
+    QLineEdit *lineEdit = fd.findChild<QLineEdit *>("fileNameEdit");
+    QVERIFY(lineEdit);
+    QListView *list = fd.findChild<QListView *>("listView");
+    QVERIFY(list);
+    QTest::qWait(1000);
+    int currentChildrenCount = list->model()->rowCount(list->rootIndex());
+    QTest::keyClick(lineEdit, Qt::Key_Space);
+    QTest::keyClick(lineEdit, Qt::Key_Period);
+    QTest::qWait(1000);
+    QVERIFY(currentChildrenCount == list->model()->rowCount(list->rootIndex()));
+    lineEdit->clear();
+    QTest::keyClick(lineEdit, Qt::Key_Period);
+    QTest::keyClick(lineEdit, Qt::Key_Space);
+    QTest::qWait(1000);
+    QVERIFY(currentChildrenCount == list->model()->rowCount(list->rootIndex()));
+}
+
 #ifdef Q_OS_UNIX
 #ifdef QT_BUILD_INTERNAL
 void tst_QFiledialog::tildeExpansion_data()
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index b29bf44307..9e0446388e 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -57,6 +57,8 @@
 # include <qt_windows.h> // for SetFileAttributes
 #endif
 
+#include <algorithm>
+
 #define WAITTIME 1000
 
 // Will try to wait for the condition while allowing event processing
@@ -717,8 +719,8 @@ void tst_QFileSystemModel::filters()
     for (int i = 0; i < rowCount; ++i)
         modelEntries.append(model->data(model->index(i, 0, root), QFileSystemModel::FileNameRole).toString());
 
-    qSort(dirEntries);
-    qSort(modelEntries);
+    std::sort(dirEntries.begin(), dirEntries.end());
+    std::sort(modelEntries.begin(), modelEntries.end());
     QCOMPARE(dirEntries, modelEntries);
 
 #ifdef Q_OS_LINUX