From 6efaa8cbf7b2f6d316978cc48880c6e740c57598 Mon Sep 17 00:00:00 2001
From: Andreas Müller <schnitzeltony@googlemail.com>
Date: Sun, 13 Sep 2015 22:36:21 +0200
Subject: qtbase: follow 5.5 platform configuration style
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This one comes up when building for non-x11 / wayland.

for further details see qtbase
commit d04c3d2079e0df79592128a67e115ecb90b08454
Author: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Date:   Mon Mar 2 16:09:22 2015 +0100

    eglfs: Pluginize RPi, iMX6 and Mali backends

    eglfs does not depend on the device makespecs anymore when it comes to these device
    integration backends (hooks). Instead, backends are autodetected by configure.

    The name of the preferred plugin is still set in the device makespecs. This
    is optional. When not set and there is more than one plugin present in the system,
    the environment variable QT_QPA_EGLFS_INTEGRATION will have to be set at runtime.
    In the absence of that, the order is undefined.

    Change-Id: Ie1ced2c9aa1beff2adb13b4fdea7c499cb5a6aab
    Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
    Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'qt5-layer')

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 6570702..f157c4d 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -22,16 +22,14 @@ do_configure_prepend_mx6() {
         if test ${IS_MX6SL} -eq 0; then
     
             cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
 IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
+EGLFS_DEVICE_INTEGRATION = eglfs_viv
 EOF
         else
             cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
 IMX6_CFLAGS             = -DLINUX=1
 EOF
         fi
-        # copy the hook in the mkspecs directory OE is using
-        cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
     else
         cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
 IMX6_CFLAGS             = -DLINUX=1
-- 
cgit v1.2.3-54-g00ecf