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

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/tools/qstring.cpp
	src/gui/image/image.pri
	src/gui/image/qimage.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
	tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp

Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5

2 files changed, 24 insertions, 5 deletions

diff --git a/src/plugins/platforms/eglfs/qeglfshooks.h b/src/plugins/platforms/eglfs/qeglfshooks.h
index dfafec73af..67f4d1803d 100644
--- a/src/plugins/platforms/eglfs/qeglfshooks.h
+++ b/src/plugins/platforms/eglfs/qeglfshooks.h
@@ -77,7 +77,8 @@ public:
     virtual bool filterConfig(EGLDisplay display, EGLConfig config) const;
     virtual void waitForVSync() const;
 
-    virtual const char *fbDeviceName() const;
+    virtual QByteArray fbDeviceName() const;
+    virtual int framebufferIndex() const;
 
     static QEglFSHooks *hooks()
     {
diff --git a/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp b/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
index f5467fd6a4..b81d260ecb 100644
--- a/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
+++ b/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
@@ -42,6 +42,7 @@
 #include "qeglfshooks.h"
 #include <QtPlatformSupport/private/qeglplatformcursor_p.h>
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
+#include <QtCore/QRegularExpression>
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -56,17 +57,34 @@ QT_BEGIN_NAMESPACE
 // this is a global static to keep the QEglFSHooks interface as clean as possible
 static int framebuffer = -1;
 
-const char *QEglFSHooks::fbDeviceName() const
+QByteArray QEglFSHooks::fbDeviceName() const
 {
-    return "/dev/fb0";
+    QByteArray fbDev = qgetenv("QT_QPA_EGLFS_FB");
+    if (fbDev.isEmpty())
+        fbDev = QByteArrayLiteral("/dev/fb0");
+
+    return fbDev;
+}
+
+int QEglFSHooks::framebufferIndex() const
+{
+    int fbIndex = 0;
+    QRegularExpression fbIndexRx(QLatin1String("fb(\\d+)"));
+    QRegularExpressionMatch match = fbIndexRx.match(fbDeviceName());
+    if (match.hasMatch())
+        fbIndex = match.captured(1).toInt();
+
+    return fbIndex;
 }
 
 void QEglFSHooks::platformInit()
 {
-    framebuffer = qt_safe_open(fbDeviceName(), O_RDONLY);
+    QByteArray fbDev = fbDeviceName();
+
+    framebuffer = qt_safe_open(fbDev, O_RDONLY);
 
     if (framebuffer == -1)
-        qWarning("EGLFS: Failed to open %s", fbDeviceName());
+        qWarning("EGLFS: Failed to open %s", qPrintable(fbDev));
 }
 
 void QEglFSHooks::platformDestroy()