7 files changed, 43 insertions, 16 deletions
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+windows/test2 b/tests/auto/corelib/io/qfileselector/platforms/+unix/test3
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/corelib/io/qfileselector/platforms/+windows/test2
+++ b/tests/auto/corelib/io/qfileselector/platforms/+unix/test3
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+windows/+winnt/test b/tests/auto/corelib/io/qfileselector/platforms/+windows/+winnt/test
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/auto/corelib/io/qfileselector/platforms/+windows/+winnt/test
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+windows/test3 b/tests/auto/corelib/io/qfileselector/platforms/+windows/test3
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/auto/corelib/io/qfileselector/platforms/+windows/test3
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+winnt/test2 b/tests/auto/corelib/io/qfileselector/platforms/+winnt/test2
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/auto/corelib/io/qfileselector/platforms/+winnt/test2
diff --git a/tests/auto/corelib/io/qfileselector/platforms/test3 b/tests/auto/corelib/io/qfileselector/platforms/test3
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/auto/corelib/io/qfileselector/platforms/test3
diff --git a/tests/auto/corelib/io/qfileselector/qfileselector.qrc b/tests/auto/corelib/io/qfileselector/qfileselector.qrc
index 8fe7b841d2..661647f933 100644
--- a/tests/auto/corelib/io/qfileselector/qfileselector.qrc
+++ b/tests/auto/corelib/io/qfileselector/qfileselector.qrc
@@ -10,6 +10,8 @@
    <file>extras/+custom3/+custom4/test</file>
    <file>extras/+custom3/+custom5/test</file>
    <file>extras/+custom5/+custom3/test</file>
+
+   <!-- platforms/test: deepest possible selection -->
    <file>platforms/test</file>
    <file>platforms/+unix/+android/test</file>
    <file>platforms/+unix/+blackberry/test</file>
@@ -17,18 +19,11 @@
    <file>platforms/+unix/+darwin/+mac/+osx/test</file>
    <file>platforms/+unix/+darwin/+mac/test</file>
    <file>platforms/+unix/+darwin/test</file>
-   <file>platforms/+windows/+wince/test</file>
-   <file>platforms/+windows/test</file>
-   <file>platforms/+windows/test2</file>
    <file>platforms/+unix/+linux/test</file>
    <file>platforms/+unix/test</file>
-   <file>platforms/test2</file>
-   <file>platforms/+android/test2</file>
-   <file>platforms/+blackberry/test2</file>
-   <file>platforms/+ios/test2</file>
-   <file>platforms/+osx/test2</file>
-   <file>platforms/+linux/test2</file>
-   <file>platforms/+wince/test2</file>
+   <file>platforms/+windows/+wince/test</file>
+   <file>platforms/+windows/+winnt/test</file>
+   <file>platforms/+windows/test</file>
    <file>platforms/+android/test</file>
    <file>platforms/+blackberry/test</file>
    <file>platforms/+ios/test</file>
@@ -37,5 +32,20 @@
    <file>platforms/+mac/test</file>
    <file>platforms/+linux/test</file>
    <file>platforms/+wince/test</file>
+
+   <!-- platforms/test2: shallow selection for the deepest selector -->
+   <file>platforms/test2</file>
+   <file>platforms/+android/test2</file>
+   <file>platforms/+blackberry/test2</file>
+   <file>platforms/+ios/test2</file>
+   <file>platforms/+osx/test2</file>
+   <file>platforms/+linux/test2</file>
+   <file>platforms/+wince/test2</file>
+   <file>platforms/+winnt/test2</file>
+
+   <!-- platforms/test3: selection for the family only -->
+   <file>platforms/test3</file>
+   <file>platforms/+windows/test3</file>
+   <file>platforms/+unix/test3</file>
 </qresource>
 </RCC>
diff --git a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
index 26bb4189d7..b3767b4887 100644
--- a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
+++ b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt-project.org/legal
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -84,8 +84,10 @@ void tst_QFileSelector::basicTest_data()
 
     QString test("/test");// '/' is here so dir string can also be selector string
     QString test2("/test2");
+    QString test3("/test3");
     QString expectedPlatform1File(":/platforms");
     QString expectedPlatform2File(""); //Only the last selector
+    QString expectedPlatform3File; // Only the first selector (the family)
 #if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && \
     !defined(Q_OS_DARWIN) && !defined(Q_OS_LINUX)
     /* We are only aware of specific unixes, and do not have test files for any of the others.
@@ -96,14 +98,26 @@ void tst_QFileSelector::basicTest_data()
         + QString("unix/test");
     expectedPlatform2File = QString(":/platforms/test2");
 #else
+    QString distributionName;
+#  if (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) || defined(Q_OS_FREEBSD)
+    distributionName = QSysInfo::productType();
+#  endif
     foreach (const QString &selector, QFileSelectorPrivate::platformSelectors()) {
+        // skip the Linux distribution name (if any) since we don't have files for them
+        if (selector == distributionName)
+            continue;
+
         expectedPlatform1File = expectedPlatform1File + QLatin1Char('/') + QLatin1Char(selectorIndicator)
             + selector;
         expectedPlatform2File = selector;
+        if (expectedPlatform3File.isNull())
+            expectedPlatform3File = selector;
     }
     expectedPlatform1File += test;
     expectedPlatform2File = QLatin1String(":/platforms/") + QLatin1Char(selectorIndicator)
         + expectedPlatform2File + test2;
+    expectedPlatform3File = QLatin1String(":/platforms/") + QLatin1Char(selectorIndicator)
+        + expectedPlatform3File + test3;
 #endif
 
     QTest::newRow("platform1") <<  QString(":/platforms/test") << QStringList()
@@ -112,6 +126,9 @@ void tst_QFileSelector::basicTest_data()
     QTest::newRow("platform2") <<  QString(":/platforms/test2") << QStringList()
         << expectedPlatform2File;
 
+    QTest::newRow("platform3") << QString(":/platforms/test3") << QStringList()
+                               << expectedPlatform3File;
+
     QString resourceTestPath(":/extras/test");
     QString custom1("custom1");
     QTest::newRow("custom1-noselector") << resourceTestPath << QStringList()