qt4-x11: workaround QT/EGL mismatch for MX6

Fix following 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

https://jira.digi.com/browse/DEL-964

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2014-03-05 17:38:58 +01:00
parent 9a83dcaad0
commit b29a00fea6
2 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,33 @@
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)

View File

@ -0,0 +1,5 @@
# Copyright (C) 2014 Digi International.
FILESEXTRAPATHS_prepend := "${THISDIR}/qt4-${PV}:"
SRC_URI_append_ccimx6adpt = " file://0001-i.MX6-force-egl-visual-ID-33.patch"