Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "qt4-x11: workaround QT/EGL mismatch for MX6" 

Similar patch sent upstream (meta-fsl-arm) was accepted.

This reverts commit b29a00fea6.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2014-03-11 15:43:56 +01:00
parent a3f3d6125f
commit 6b7f1b2492
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-digi-dey/recipes-qt/qt4/qt4-4.8.5/ccimx6adpt/0001-i.MX6-force-egl-visual-ID-33.patch
View File

@ -1,33 +0,0 @@
From: Javier Viguera <javier.viguera@digi.com>
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 <javier.viguera@digi.com>
---
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)

5
meta-digi-dey/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
View File

@ -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"