Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	configure
	src/plugins/platforms/eglfs/qeglfsintegration.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp

Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b

1 files changed, 4 insertions, 15 deletions

diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index ad7600c784..1acf885285 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -1093,6 +1093,10 @@ static QSet<QString> fileListUnderIndex(const QFileSystemModel *model, const QMo
 
 void tst_QFileSystemModel::specialFiles()
 {
+#ifndef Q_OS_UNIX
+     QSKIP("Not implemented");
+#endif
+
     QFileSystemModel model;
 
     model.setFilter(QDir::AllEntries | QDir::System | QDir::Hidden);
@@ -1101,23 +1105,8 @@ void tst_QFileSystemModel::specialFiles()
     // as it will always return a valid index for existing files,
     // even if the file is not visible with the given filter.
 
-#if defined(Q_OS_UNIX)
     const QModelIndex rootIndex = model.setRootPath(QStringLiteral("/dev/"));
     const QString testFileName = QStringLiteral("null");
-#elif defined(Q_OS_WIN)
-    const QModelIndex rootIndex = model.setRootPath(flatDirTestPath);
-
-    const QString testFileName = QStringLiteral("linkSource.lnk");
-
-    QFile file(flatDirTestPath + QLatin1String("/linkTarget.txt"));
-    QVERIFY(file.open(QIODevice::WriteOnly));
-    file.close();
-    QVERIFY(file.link(flatDirTestPath + '/' + testFileName));
-#else
-    QSKIP("Not implemented");
-    QModelIndex rootIndex;
-    QString testFileName;
-#endif
 
     QTRY_VERIFY(fileListUnderIndex(&model, rootIndex).contains(testFileName));