From 6b7f1b2492d099a8c1fe2fd8b04aad34fc7bc550 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 11 Mar 2014 15:43:56 +0100 Subject: [PATCH] Revert "qt4-x11: workaround QT/EGL mismatch for MX6" Similar patch sent upstream (meta-fsl-arm) was accepted. This reverts commit b29a00fea697f8c18fd98472b5855be625ae0db0. Signed-off-by: Javier Viguera --- .../0001-i.MX6-force-egl-visual-ID-33.patch | 33 ------------------- .../qt4/qt4-x11-free_4.8.5.bbappend | 5 --- 2 files changed, 38 deletions(-) delete mode 100644 meta-digi-dey/recipes-qt/qt4/qt4-4.8.5/ccimx6adpt/0001-i.MX6-force-egl-visual-ID-33.patch delete mode 100644 meta-digi-dey/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend diff --git a/meta-digi-dey/recipes-qt/qt4/qt4-4.8.5/ccimx6adpt/0001-i.MX6-force-egl-visual-ID-33.patch b/meta-digi-dey/recipes-qt/qt4/qt4-4.8.5/ccimx6adpt/0001-i.MX6-force-egl-visual-ID-33.patch deleted file mode 100644 index 6417301d1..000000000 --- a/meta-digi-dey/recipes-qt/qt4/qt4-4.8.5/ccimx6adpt/0001-i.MX6-force-egl-visual-ID-33.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Javier Viguera -Date: Mon, 3 Mar 2014 17:10:41 +0100 -Subject: [PATCH] i.MX6: force egl visual ID 33 - -Workaround mismatch between EGL binary libraries and QT for FSL MX6 -based platforms. - -Error: -Warning: EGL suggested using X Visual ID 33 (ARGB0888) for EGL config 28 (ARGB0444), but this is incompatable -Unable to find an X11 visual which matches EGL config 28 - -Patch adapted from: - -http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard - -Signed-off-by: Javier Viguera ---- - src/gui/egl/qegl_x11.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp -index 196d0f77bf2d..8acf5a6c99d4 100644 ---- a/src/gui/egl/qegl_x11.cpp -+++ b/src/gui/egl/qegl_x11.cpp -@@ -319,7 +319,7 @@ VisualID QEgl::getCompatibleVisualId(EGLConfig config) - } - - qWarning("Unable to find an X11 visual which matches EGL config %d", configId); -- return (VisualID)0; -+ return (VisualID)33; - } - - void qt_set_winid_on_widget(QWidget* w, Qt::HANDLE id) diff --git a/meta-digi-dey/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend deleted file mode 100644 index 461140b2a..000000000 --- a/meta-digi-dey/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2014 Digi International. - -FILESEXTRAPATHS_prepend := "${THISDIR}/qt4-${PV}:" - -SRC_URI_append_ccimx6adpt = " file://0001-i.MX6-force-egl-visual-ID-33.patch"