Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf
	mkspecs/win32-g++/qmake.conf
	src/corelib/global/qglobal_p.h
	src/corelib/global/qoperatingsystemversion_p.h
	src/corelib/io/qfilesystemengine_win.cpp
	src/network/bearer/qbearerengine.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/sql/doc/snippets/code/doc_src_sql-driver.cpp
	src/widgets/kernel/qwidget_p.h
	src/widgets/kernel/qwidgetwindow.cpp
	src/widgets/styles/qfusionstyle.cpp
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp

Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8

14 files changed, 693 insertions, 24 deletions

diff --git a/src/plugins/platforms/eglfs/api/qeglfscontext_p.h b/src/plugins/platforms/eglfs/api/qeglfscontext_p.h
index 96f7f01381..af8725b6b3 100644
--- a/src/plugins/platforms/eglfs/api/qeglfscontext_p.h
+++ b/src/plugins/platforms/eglfs/api/qeglfscontext_p.h
@@ -52,6 +52,7 @@
 //
 
 #include "qeglfsglobal_p.h"
+#include "qeglfscursor_p.h"
 #include <QtEglSupport/private/qeglplatformcontext_p.h>
 #include <QtCore/QVariant>
 
@@ -68,6 +69,8 @@ public:
     void runGLChecks() override;
     void swapBuffers(QPlatformSurface *surface) override;
 
+    QEglFSCursorData cursorData;
+
 private:
     EGLNativeWindowType m_tempWindow;
 };
diff --git a/src/plugins/platforms/eglfs/api/qeglfscursor.cpp b/src/plugins/platforms/eglfs/api/qeglfscursor.cpp
index f46206cab5..22319fcc66 100644
--- a/src/plugins/platforms/eglfs/api/qeglfscursor.cpp
+++ b/src/plugins/platforms/eglfs/api/qeglfscursor.cpp
@@ -40,10 +40,10 @@
 #include "qeglfscursor_p.h"
 #include "qeglfsintegration_p.h"
 #include "qeglfsscreen_p.h"
+#include "qeglfscontext_p.h"
 
 #include <qpa/qwindowsysteminterface.h>
 #include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLShaderProgram>
 #include <QtCore/QFile>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonArray>
@@ -115,13 +115,6 @@ void QEglFSCursorDeviceListener::onDeviceListChanged(QInputDeviceManager::Device
 
 void QEglFSCursor::resetResources()
 {
-    if (QOpenGLContext *ctx = QOpenGLContext::currentContext()) {
-        GraphicsContextData &gfx(m_gfx[ctx]);
-        delete gfx.program;
-        glDeleteTextures(1, &gfx.customCursorTexture);
-        glDeleteTextures(1, &gfx.atlasTexture);
-        gfx = GraphicsContextData();
-    }
     m_cursor.customCursorPending = !m_cursor.customCursorImage.isNull();
 }
 
@@ -144,8 +137,8 @@ void QEglFSCursor::createShaderPrograms()
         "   gl_FragColor = texture2D(texture, textureCoord).bgra;\n"
         "}\n";
 
-    GraphicsContextData &gfx(m_gfx[QOpenGLContext::currentContext()]);
-    gfx.program = new QOpenGLShaderProgram;
+    QEglFSCursorData &gfx = static_cast<QEglFSContext*>(QOpenGLContext::currentContext()->handle())->cursorData;
+    gfx.program.reset(new QOpenGLShaderProgram);
     gfx.program->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, textureVertexProgram);
     gfx.program->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, textureFragmentProgram);
     gfx.program->bindAttributeLocation("vertexCoordEntry", 0);
@@ -475,7 +468,7 @@ void QEglFSCursor::draw(const QRectF &r)
 {
     StateSaver stateSaver;
 
-    GraphicsContextData &gfx(m_gfx[QOpenGLContext::currentContext()]);
+    QEglFSCursorData &gfx = static_cast<QEglFSContext*>(QOpenGLContext::currentContext()->handle())->cursorData;
     if (!gfx.program) {
         // one time initialization
         initializeOpenGLFunctions();
diff --git a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h
index aaeb83cb99..89c2e89f58 100644
--- a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h
+++ b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h
@@ -56,6 +56,7 @@
 #include <qpa/qplatformscreen.h>
 #include <QtGui/QMatrix4x4>
 #include <QtGui/QOpenGLFunctions>
+#include <QtGui/QOpenGLShaderProgram>
 #include <QtGui/private/qinputdevicemanager_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -81,6 +82,15 @@ private:
 
 #if QT_CONFIG(opengl)
 
+struct QEglFSCursorData {
+    QScopedPointer<QOpenGLShaderProgram> program;
+    int textureEntry = 0;
+    int matEntry = 0;
+    uint customCursorTexture = 0;
+    uint atlasTexture = 0;
+    qint64 customCursorKey = 0;
+};
+
 class Q_EGLFS_EXPORT QEglFSCursor : public QPlatformCursor
                                   , protected QOpenGLFunctions
 {
@@ -143,18 +153,6 @@ private:
     QEglFSCursorDeviceListener *m_deviceListener;
     bool m_updateRequested;
     QMatrix4x4 m_rotationMatrix;
-
-    struct GraphicsContextData {
-        GraphicsContextData() : program(nullptr), textureEntry(0), matEntry(0),
-            customCursorTexture(0), atlasTexture(0), customCursorKey(0) { }
-        QOpenGLShaderProgram *program;
-        int textureEntry;
-        int matEntry;
-        uint customCursorTexture;
-        uint atlasTexture;
-        qint64 customCursorKey;
-    };
-    QHash<QOpenGLContext *, GraphicsContextData> m_gfx;
 };
 #endif // QT_CONFIG(opengl)
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro b/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro
index 6d759938b5..92ee83fd8f 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro
@@ -7,8 +7,9 @@ qtConfig(eglfs_egldevice): SUBDIRS *= eglfs_kms_support eglfs_kms_egldevice
 qtConfig(eglfs_brcm): SUBDIRS += eglfs_brcm
 qtConfig(eglfs_mali): SUBDIRS += eglfs_mali
 qtConfig(eglfs_viv): SUBDIRS += eglfs_viv
+qtConfig(eglfs_rcar): SUBDIRS += eglfs_rcar
 qtConfig(eglfs_viv_wl): SUBDIRS += eglfs_viv_wl
-
+qtConfig(eglfs_openwfd): SUBDIRS += eglfs_openwfd
 qtConfig(opengl): SUBDIRS += eglfs_emu
 
 eglfs_kms_egldevice.depends = eglfs_kms_support
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/eglfs_openwfd.json b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/eglfs_openwfd.json
new file mode 100644
index 0000000000..cf7cf6b887
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/eglfs_openwfd.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "eglfs_openwfd" ]
+}
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/eglfs_openwfd.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/eglfs_openwfd.pro
new file mode 100644
index 0000000000..448b4cbe21
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/eglfs_openwfd.pro
@@ -0,0 +1,17 @@
+TARGET = qeglfs-openwfd-integration
+
+QT += core-private gui-private eglfsdeviceintegration-private
+
+INCLUDEPATH += $$PWD/../../api
+CONFIG += egl
+
+SOURCES += $$PWD/qeglfsopenwfdmain.cpp \
+           $$PWD/qeglfsopenwfdintegration.cpp
+
+HEADERS += $$PWD/qeglfsopenwfdintegration.h
+
+OTHER_FILES += $$PWD/eglfs_openwfd.json
+
+PLUGIN_TYPE = egldeviceintegrations
+PLUGIN_CLASS_NAME = QEglFSOpenWFDIntegrationPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp
new file mode 100644
index 0000000000..bb176a69d2
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp
@@ -0,0 +1,223 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qeglfsopenwfdintegration.h"
+
+#include "wfd.h"
+#include "wfdext2.h"
+
+QT_BEGIN_NAMESPACE
+
+#define MAX_NUM_OF_WFD_BUFFERS 3
+#define MAX_NUM_OF_WFD_DEVICES 4
+#define MAX_NUM_OF_WFD_PIPELINES 4
+#define MAX_NUM_OF_WFD_PORT_MODES 64
+#define MAX_NUM_OF_WFD_PORTS 4
+
+typedef struct wfd_buffer {
+    WFD_EGLImageType*   image;
+    WFDSource           source;
+} wfd_buffer_t;
+
+typedef struct wfd_window {
+    WFDDevice       dev;
+    WFDPort         port;
+    WFDPipeline     pipeline;
+    int             numBuffers;
+    wfd_buffer_t    buffers[MAX_NUM_OF_WFD_BUFFERS];
+} wfd_window_t;
+
+void QEglFSOpenWFDIntegration::platformInit()
+{
+    QEglFSDeviceIntegration::platformInit();
+
+    mNativeDisplay = EGL_DEFAULT_DISPLAY;
+
+    // Get device list
+    WFDint numDevs = wfdEnumerateDevices(nullptr, 0, nullptr);
+    WFDint devIds[MAX_NUM_OF_WFD_DEVICES];
+
+    if (numDevs > 0)
+        wfdEnumerateDevices(devIds, numDevs, nullptr);
+
+    // Create device
+    mDevice = wfdCreateDevice(WFD_DEFAULT_DEVICE_ID, nullptr);
+
+    if (WFD_INVALID_HANDLE == mDevice)
+        qFatal( "Failed to create wfd device");
+
+    // Get port list
+    WFDint portIds[MAX_NUM_OF_WFD_PORTS];
+    WFDint numPorts = wfdEnumeratePorts(mDevice, nullptr, 0, nullptr);
+    wfdEnumeratePorts(mDevice, portIds, numPorts, nullptr);
+
+    // Create port
+    mPort = wfdCreatePort(mDevice, portIds[0], nullptr);
+
+    if (WFD_INVALID_HANDLE == mPort)
+        qFatal("Failed to create wfd port");
+
+    // Get port modes
+    WFDint numPortModes = wfdGetPortModes(mDevice, mPort, nullptr, 0);
+    WFDPortMode portModes[MAX_NUM_OF_WFD_PORT_MODES];
+    wfdGetPortModes(mDevice, mPort, portModes, numPortModes);
+
+    // Get width and height
+    mScreenSize.setWidth(wfdGetPortModeAttribi(mDevice, mPort, portModes[0], WFD_PORT_MODE_WIDTH));
+    mScreenSize.setHeight(wfdGetPortModeAttribi(mDevice, mPort, portModes[0], WFD_PORT_MODE_HEIGHT));
+
+    // Set port mode
+    wfdSetPortMode(mDevice, mPort, portModes[0]);
+    WFDErrorCode eError = wfdGetError(mDevice);
+    if (WFD_ERROR_NONE != eError)
+        qFatal("Failed to set wfd port mode");
+
+    // Power on
+    wfdSetPortAttribi(mDevice, mPort, WFD_PORT_POWER_MODE, WFD_POWER_MODE_ON);
+    eError = wfdGetError(mDevice);
+    if (WFD_ERROR_NONE != eError)
+        qFatal("Failed to power on wfd port");
+}
+
+QSize QEglFSOpenWFDIntegration::screenSize() const
+{
+    return mScreenSize;
+}
+
+EGLNativeDisplayType QEglFSOpenWFDIntegration::platformDisplay() const
+{
+    return mNativeDisplay;
+}
+
+EGLNativeWindowType QEglFSOpenWFDIntegration::createNativeWindow(QPlatformWindow *window,
+                                                                 const QSize &size,
+                                                                 const QSurfaceFormat &format)
+{
+    Q_UNUSED(window);
+    Q_UNUSED(format);
+
+    // Get list of pipelines
+    WFDint numPipelines = wfdEnumeratePipelines(mDevice, nullptr, 0, nullptr);
+
+    WFDint pipelineIds[MAX_NUM_OF_WFD_PIPELINES];
+    wfdEnumeratePipelines(mDevice, pipelineIds, numPipelines, nullptr);
+
+    WFDint testId = 0;
+    testId = pipelineIds[0];
+    WFDPipeline pipeline = wfdCreatePipeline(mDevice, testId, nullptr);
+    if (WFD_INVALID_HANDLE == pipeline)
+        qFatal("Failed to create wfd pipeline");
+
+    wfdSetPipelineAttribi(mDevice, pipeline, WFD_PIPELINE_TRANSPARENCY_ENABLE,
+                          (WFD_TRANSPARENCY_SOURCE_ALPHA|WFD_TRANSPARENCY_GLOBAL_ALPHA));
+
+    WFDErrorCode eError = wfdGetError(mDevice);
+    if (WFD_ERROR_NONE != eError)
+        qFatal("Failed to set WFD_PIPELINE_TRANSPARENCY_ENABLE");
+
+    wfdSetPipelineAttribi(mDevice, pipeline, WFD_PIPELINE_GLOBAL_ALPHA, 255);
+    eError = wfdGetError(mDevice);
+    if (WFD_ERROR_NONE != eError)
+        qFatal("Failed to set WFD_PIPELINE_GLOBAL_ALPHA");
+
+    wfdBindPipelineToPort(mDevice, mPort, pipeline);
+    eError = wfdGetError(mDevice);
+    if (WFD_ERROR_NONE != eError)
+        qFatal("Failed to bind port to pipeline");
+
+    // Create buffers
+    WFDSource source[MAX_NUM_OF_WFD_BUFFERS] = {WFD_INVALID_HANDLE, WFD_INVALID_HANDLE,
+                                                WFD_INVALID_HANDLE};
+    WFDEGLImage eglImageHandles[MAX_NUM_OF_WFD_BUFFERS];
+    WFD_EGLImageType* wfdEglImages[MAX_NUM_OF_WFD_BUFFERS];
+
+    for (int i = 0; i < MAX_NUM_OF_WFD_BUFFERS; i++) {
+        wfdCreateWFDEGLImages(mDevice, mScreenSize.width(), mScreenSize.height(),
+                              WFD_FORMAT_RGBA8888, WFD_USAGE_OPENGL_ES2 | WFD_USAGE_DISPLAY,
+                              1, &(eglImageHandles[i]), 0);
+
+        wfdEglImages[i] = (WFD_EGLImageType *)(eglImageHandles[i]);
+        if (WFD_INVALID_HANDLE == wfdEglImages[i])
+            qFatal("Failed to create WDFEGLImages");
+
+        source[i] = wfdCreateSourceFromImage(mDevice, pipeline, eglImageHandles[i], nullptr);
+        if (WFD_INVALID_HANDLE == source[i])
+            qFatal("Failed to create source from EGLImage");
+    }
+
+    // Commit port
+    wfdDeviceCommit(mDevice, WFD_COMMIT_ENTIRE_PORT, mPort);
+    eError = wfdGetError(mDevice);
+    if (WFD_ERROR_NONE != eError)
+            qFatal("Failed to commit port");
+
+    // Create native window
+    wfd_window_t* nativeWindow = (wfd_window_t*)malloc(sizeof(wfd_window_t));
+    if (nullptr == nativeWindow)
+            qFatal("Failed to allocate memory for native window");
+
+    nativeWindow->dev = mDevice;
+    nativeWindow->port = mPort;
+    nativeWindow->pipeline = pipeline;
+    nativeWindow->numBuffers = MAX_NUM_OF_WFD_BUFFERS;
+
+    for (int i = 0; i < MAX_NUM_OF_WFD_BUFFERS; i++) {
+        nativeWindow->buffers[i].image  = wfdEglImages[i];
+        nativeWindow->buffers[i].source = source[i];
+    }
+
+    return (EGLNativeWindowType)nativeWindow;
+}
+
+QSurfaceFormat QEglFSOpenWFDIntegration::surfaceFormatFor(const QSurfaceFormat &inputFormat) const
+{
+    QSurfaceFormat format;
+    format.setRedBufferSize(8);
+    format.setGreenBufferSize(8);
+    format.setBlueBufferSize(8);
+    format.setAlphaBufferSize(8);
+    return format;
+}
+
+void QEglFSOpenWFDIntegration::destroyNativeWindow(EGLNativeWindowType window)
+{
+    free((void*)window);
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.h
new file mode 100644
index 0000000000..189ddd4d7a
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QEGLFSOPENWFDINTEGRATION_H
+#define QEGLFSOPENWFDINTEGRATION_H
+
+#include "private/qeglfsdeviceintegration_p.h"
+#define WFD_WFDEXT_PROTOTYPES
+#include "wfd.h"
+#include "wfdext2.h"
+
+QT_BEGIN_NAMESPACE
+
+class QEglFSOpenWFDIntegration : public QEglFSDeviceIntegration
+{
+public:
+    void platformInit() override;
+    QSize screenSize() const override;
+    EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) override;
+    void destroyNativeWindow(EGLNativeWindowType window) override;
+    EGLNativeDisplayType platformDisplay() const override;
+    virtual QSurfaceFormat surfaceFormatFor(const QSurfaceFormat &inputFormat) const;
+
+private:
+    QSize mScreenSize;
+    EGLNativeDisplayType mNativeDisplay;
+    WFDDevice mDevice;
+    WFDPort mPort;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdmain.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdmain.cpp
new file mode 100644
index 0000000000..1d6132b55e
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdmain.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "private/qeglfsdeviceintegration_p.h"
+#include "qeglfsopenwfdintegration.h"
+
+QT_BEGIN_NAMESPACE
+
+class QEglFSOpenWFDIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_openwfd.json")
+
+public:
+    QEglFSDeviceIntegration *create() override {
+        return new QEglFSOpenWFDIntegration;
+    }
+};
+
+QT_END_NAMESPACE
+
+#include "qeglfsopenwfdmain.moc"
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/eglfs_rcar.json b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/eglfs_rcar.json
new file mode 100644
index 0000000000..77b3083eef
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/eglfs_rcar.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "eglfs_rcar" ]
+}
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/eglfs_rcar.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/eglfs_rcar.pro
new file mode 100644
index 0000000000..04236449a0
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/eglfs_rcar.pro
@@ -0,0 +1,19 @@
+TARGET = qeglfs-rcar-integration
+
+QT += core-private gui-private eglfsdeviceintegration-private
+
+INCLUDEPATH += $$PWD/../../api
+CONFIG += egl
+DEFINES += LINUX=1 EGL_API_FB=1
+QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
+
+SOURCES += $$PWD/qeglfsrcarmain.cpp \
+           $$PWD/qeglfsrcarintegration.cpp
+
+HEADERS += $$PWD/qeglfsrcarintegration.h
+
+OTHER_FILES += $$PWD/eglfs_rcar.json
+
+PLUGIN_TYPE = egldeviceintegrations
+PLUGIN_CLASS_NAME = QEglFSRcarIntegrationPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.cpp
new file mode 100644
index 0000000000..98cf1d3bfb
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.cpp
@@ -0,0 +1,159 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDebug>
+#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <EGL/egl.h>
+#include "INTEGRITY.h"
+#include "qeglfsrcarintegration.h"
+
+#define RCAR_DEFAULT_DISPLAY 1
+#define RCAR_DEFAULT_WM_LAYER 2
+
+extern "C" unsigned long PVRGrfxServerInit(void);
+
+QT_BEGIN_NAMESPACE
+
+void QEglFSRcarIntegration::platformInit()
+{
+    QEglFSDeviceIntegration::platformInit();
+
+    PVRGrfxServerInit();
+
+    mScreenSize = q_screenSizeFromFb(0);
+    mNativeDisplay = (NativeDisplayType)EGL_DEFAULT_DISPLAY;
+}
+
+QSize QEglFSRcarIntegration::screenSize() const
+{
+    return mScreenSize;
+}
+
+EGLNativeDisplayType QEglFSRcarIntegration::platformDisplay() const
+{
+    return mNativeDisplay;
+}
+
+static r_wm_WinColorFmt_t getWMColorFormat(const QSurfaceFormat &format)
+{
+    const int a = format.alphaBufferSize();
+    const int r = format.redBufferSize();
+    const int g = format.greenBufferSize();
+    const int b = format.blueBufferSize();
+
+    switch (r) {
+    case 4:
+        if (g == 4 && b == 4 && a == 4)
+            return R_WM_COLORFMT_ARGB4444;
+        break;
+    case 5:
+        if (g == 6 && b == 5 && a == 0)
+            return R_WM_COLORFMT_RGB565;
+        else if (g == 5 && b == 5 && a == 1)
+            return R_WM_COLORFMT_ARGB1555;
+        break;
+    case 8:
+        if (g == 8 && b == 8 && a == 0)
+            return R_WM_COLORFMT_RGB0888;
+        else if (g == 8 && b == 8 && a == 8)
+            return R_WM_COLORFMT_ARGB8888;
+        break;
+    }
+
+    qFatal("Unsupported color format: R:%d G:%d B:%d A:%d", r, g, b, a);
+    return R_WM_COLORFMT_LAST;
+}
+
+EGLNativeWindowType QEglFSRcarIntegration::createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format)
+{
+    bool ok;
+
+    mNativeDisplayID = qEnvironmentVariableIntValue("QT_QPA_WM_DISP_ID", &ok);
+    if (!ok)
+        mNativeDisplayID = RCAR_DEFAULT_DISPLAY;
+
+    r_wm_Error_t wm_err = R_WM_DevInit(mNativeDisplayID);
+    if (wm_err != R_WM_ERR_OK)
+        qFatal("Failed to init WM Dev: %d, error: %d", mNativeDisplayID, wm_err);
+
+    mNativeWindow = (EGLNativeWindowTypeREL*)malloc(sizeof(EGLNativeWindowTypeREL));
+    memset(mNativeWindow, 0, sizeof(EGLNativeWindowTypeREL));
+
+    mNativeWindow->ColorFmt = getWMColorFormat(format);
+    mNativeWindow->PosX = 0;
+    mNativeWindow->PosY = 0;
+    mNativeWindow->PosZ = qEnvironmentVariableIntValue("QT_QPA_WM_LAYER", &ok);
+    if (!ok)
+        mNativeWindow->PosZ = RCAR_DEFAULT_WM_LAYER;
+    mNativeWindow->Pitch = size.width();
+    mNativeWindow->Width = size.width();
+    mNativeWindow->Height = size.height();
+    mNativeWindow->Alpha = format.alphaBufferSize();
+
+    if (format.swapBehavior() == QSurfaceFormat::DefaultSwapBehavior)
+        mNativeWindow->Surface.BufNum = 3;
+    else
+        mNativeWindow->Surface.BufNum = format.swapBehavior();
+
+    mNativeWindow->Surface.Type = R_WM_SURFACE_FB;
+    mNativeWindow->Surface.BufMode = R_WM_WINBUF_ALLOC_INTERNAL;
+
+    wm_err = R_WM_WindowCreate(mNativeDisplayID, mNativeWindow);
+    if (wm_err != R_WM_ERR_OK)
+        qFatal("Failed to create window layer: %d", wm_err);
+    wm_err = R_WM_DevEventRegister(mNativeDisplayID, R_WM_EVENT_VBLANK, 0);
+    if (wm_err != R_WM_ERR_OK)
+        qFatal("Failed to Register vsync event: %d", wm_err);
+    wm_err = R_WM_WindowEnable(mNativeDisplayID, mNativeWindow);
+    if (wm_err != R_WM_ERR_OK)
+        qFatal("Failed to Enable window surface: %d", wm_err);
+
+    return static_cast<EGLNativeWindowType>(mNativeWindow);
+}
+
+void QEglFSRcarIntegration::destroyNativeWindow(EGLNativeWindowType window)
+{
+    R_WM_WindowDisable(mNativeDisplayID, mNativeWindow);
+    usleep(100000); //Needed to allow Window Manager make the window transparent
+    R_WM_WindowDelete(mNativeDisplayID, mNativeWindow);
+    R_WM_DevDeinit(mNativeDisplayID);
+    free(mNativeWindow);
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.h
new file mode 100644
index 0000000000..08911594f9
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QEGLFSVIVINTEGRATION_H
+#define QEGLFSVIVINTEGRATION_H
+
+#include "private/qeglfsdeviceintegration_p.h"
+#include "EGL/eglext_REL.h"
+
+QT_BEGIN_NAMESPACE
+
+class QEglFSRcarIntegration : public QEglFSDeviceIntegration
+{
+public:
+    void platformInit() override;
+    QSize screenSize() const override;
+    EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) override;
+    void destroyNativeWindow(EGLNativeWindowType window) override;
+    EGLNativeDisplayType platformDisplay() const override;
+
+private:
+    QSize mScreenSize;
+    EGLNativeDisplayType mNativeDisplay;
+    EGLNativeWindowTypeREL *mNativeWindow;
+    int mNativeDisplayID;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarmain.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarmain.cpp
new file mode 100644
index 0000000000..6cf3e1387d
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarmain.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "INTEGRITY.h"
+#include "private/qeglfsdeviceintegration_p.h"
+#include "qeglfsrcarintegration.h"
+
+QT_BEGIN_NAMESPACE
+
+class QEglFSRcarIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_rcar.json")
+
+public:
+    QEglFSDeviceIntegration *create() override { return new QEglFSRcarIntegration; }
+};
+
+QT_END_NAMESPACE
+
+#include "qeglfsrcarmain.moc"