summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/qt5-layer
diff options
context:
space:
mode:
authorantznin <agodard@witekio.com>2020-05-05 15:28:15 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2020-05-05 11:58:53 -0300
commiteaefe965615070e58438b868467f7a045289d8ec (patch)
tree9b49eda9e6a86933e27b10892cc89f15b77b33e4 /dynamic-layers/qt5-layer
parent1da242af42a5a88cd2527bf829570d6f10b27010 (diff)
downloadmeta-freescale-eaefe965615070e58438b868467f7a045289d8ec.tar.gz
qtbase: Fix patch fuzz for mkspecs/linux-oe-g++/qmake.conf
The current version of the patch causes a fuzz because of context change. Signed-off-by: antznin <agodard@witekio.com>
Diffstat (limited to 'dynamic-layers/qt5-layer')
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch
index 8e7129e3..46541d43 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch
@@ -1,8 +1,8 @@
1Index: git/mkspecs/linux-oe-g++/qmake.conf 1diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
2=================================================================== 2index c202c47fa1..2bfb96f4ec 100644
3--- git.orig/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:03:17.000000000 -0600 3--- a/mkspecs/linux-oe-g++/qmake.conf
4+++ git/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:06:23.000000000 -0600 4+++ b/mkspecs/linux-oe-g++/qmake.conf
5@@ -37,6 +37,8 @@ QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) 5@@ -33,6 +33,8 @@ QMAKE_CFLAGS_ISYSTEM =
6 # for the SDK 6 # for the SDK
7 isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) 7 isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
8 8
@@ -10,4 +10,6 @@ Index: git/mkspecs/linux-oe-g++/qmake.conf
10+ 10+
11 include(../oe-device-extra.pri) 11 include(../oe-device-extra.pri)
12 12
13 QMAKE_LIBS_EGL += -lEGL 13 load(device_config)
14--
152.17.1