]> code.ossystems Code Review - meta-freescale.git/commitdiff
qtbase: set default EGLFS_DEVICE_INTEGRATION before oe-device-extra.pri
authorMing Liu <liu.ming50@gmail.com>
Mon, 8 Jan 2018 12:22:07 +0000 (13:22 +0100)
committerOtavio Salvador <otavio@ossystems.com.br>
Tue, 6 Feb 2018 12:04:45 +0000 (10:04 -0200)
This allows the users to be able to override it in oe-device-extra.pri.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch

index 794fa622257f090e66c2f5d389436957e162e531..8e7129e3fd1449b6ca8abbb6a15d893180b2cd0e 100644 (file)
@@ -2,12 +2,12 @@ Index: git/mkspecs/linux-oe-g++/qmake.conf
 ===================================================================
 --- git.orig/mkspecs/linux-oe-g++/qmake.conf   2016-12-14 17:03:17.000000000 -0600
 +++ git/mkspecs/linux-oe-g++/qmake.conf        2016-12-14 17:06:23.000000000 -0600
-@@ -39,6 +39,8 @@
- include(../oe-device-extra.pri)
+@@ -37,6 +37,8 @@ QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK)
+ # for the SDK
+ isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
  
 +EGLFS_DEVICE_INTEGRATION = eglfs_viv
 +
+ include(../oe-device-extra.pri)
  QMAKE_LIBS_EGL        += -lEGL
- QMAKE_LIBS_OPENGL_ES2 += -lEGL -lGLESv2
- QMAKE_LIBS_OPENVG     += -lEGL -lOpenVG