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

Conflicts:
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro

Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
index 2c363e3d69..ea8f594f9c 100644
--- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
@@ -60,6 +60,7 @@ class tst_QGuiApplication: public tst_QCoreApplication
     Q_OBJECT
 
 private slots:
+    void initTestCase();
     void cleanup();
     void displayName();
     void desktopFileName();
@@ -85,6 +86,21 @@ private slots:
     void settableStyleHints(); // Needs to run last as it changes style hints.
 };
 
+void tst_QGuiApplication::initTestCase()
+{
+#ifdef QT_QPA_DEFAULT_PLATFORM_NAME
+    if ((QString::compare(QStringLiteral(QT_QPA_DEFAULT_PLATFORM_NAME),
+         QStringLiteral("eglfs"), Qt::CaseInsensitive) == 0) ||
+        (QString::compare(QString::fromLatin1(qgetenv("QT_QPA_PLATFORM")),
+         QStringLiteral("eglfs"), Qt::CaseInsensitive) == 0)) {
+        // Set env variables to disable input and cursor because eglfs is single fullscreen window
+        // and trying to initialize input and cursor will crash test.
+        qputenv("QT_QPA_EGLFS_DISABLE_INPUT", "1");
+        qputenv("QT_QPA_EGLFS_HIDECURSOR", "1");
+    }
+#endif
+}
+
 void tst_QGuiApplication::cleanup()
 {
     QVERIFY(QGuiApplication::allWindows().isEmpty());