From 4157cb42693171cb4f8e47752393a240461f7efa Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 15 Oct 2015 12:57:05 +0300 Subject: qt5: oe-device-extra.pri is now supported in upstream Use of oe-device-extra.pri was merged upstream, so remove unneeded parts for our layer. Change-Id: I40ffeadc80780d49ba777e7cfd24fc2048d3a418 Reviewed-by: Teemu Holappa --- recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf | 2 -- recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri | 3 +++ recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri | 2 ++ recipes-qt/qt5/qtbase/oe-device-extra.pri | 2 ++ recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri | 2 ++ recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri | 3 +++ recipes-qt/qt5/qtbase_%.bbappend | 9 --------- scripts/manifest.xml | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf index dadea00..b5962dc 100644 --- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf +++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf @@ -4,8 +4,6 @@ include(../common/linux_device_pre.conf) -QMAKE_PLATFORM += boot2qt - # Load device-specific qmake.conf part, if any exists(../../oe-device-extra.pri):include(../../oe-device-extra.pri) diff --git a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri index 3c0971c..9f6fdc3 100644 --- a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri +++ b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri @@ -1,2 +1,5 @@ QMAKE_LIBS_EGL = -lQtGlesStreamClient QMAKE_LIBS_OPENGL_ES2 = -lQtGlesStreamClient + +QMAKE_PLATFORM += boot2qt +QT_QPA_DEFAULT_PLATFORM = eglfs diff --git a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri index f365169..f5445e3 100644 --- a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri +++ b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri @@ -5,4 +5,6 @@ QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL QMAKE_CFLAGS += $$IMX6_CFLAGS QMAKE_CXXFLAGS += $$IMX6_CFLAGS +QMAKE_PLATFORM += boot2qt +QT_QPA_DEFAULT_PLATFORM = eglfs EGLFS_DEVICE_INTEGRATION = eglfs_viv diff --git a/recipes-qt/qt5/qtbase/oe-device-extra.pri b/recipes-qt/qt5/qtbase/oe-device-extra.pri index 6c4bdd9..250c999 100644 --- a/recipes-qt/qt5/qtbase/oe-device-extra.pri +++ b/recipes-qt/qt5/qtbase/oe-device-extra.pri @@ -1 +1,3 @@ # This file contains device-specific qmake.conf settings +QMAKE_PLATFORM += boot2qt +QT_QPA_DEFAULT_PLATFORM = eglfs diff --git a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri index 84488cb..9f64808 100644 --- a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri +++ b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri @@ -6,4 +6,6 @@ QMAKE_LIBS_EGL = -lEGL -lGLESv2 QMAKE_CFLAGS += $$RPI_CFLAGS QMAKE_CXXFLAGS += $$RPI_CFLAGS +QMAKE_PLATFORM += boot2qt +QT_QPA_DEFAULT_PLATFORM = eglfs EGLFS_DEVICE_INTEGRATION = eglfs_brcm diff --git a/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri b/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri index 6a5edd9..0a18a5d 100644 --- a/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri +++ b/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri @@ -1,3 +1,6 @@ QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 $${QMAKE_LIBS_EGL} QMAKE_LIBS_OPENVG = -lOpenVG $${QMAKE_LIBS_EGL} + +QMAKE_PLATFORM += boot2qt +QT_QPA_DEFAULT_PLATFORM = eglfs diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend index f29cb10..adddd94 100644 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -43,13 +43,4 @@ SRC_URI += " \ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs - sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <