1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove incorrect inclusion of GL support headers given EGL presence

Browse Source 
The include files have a hard dependency on OpenGL (ES2); testing for the
presence of  EGL support is insufficient grounds for including this
functionality

Change-Id: I391b5dbbcbef40ecf68d16617b6eb1c0bb4b799e
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Donald Carr 2012-04-16 05:04:33 +00:00 committed by Qt by Nokia
parent 6e1594e456
commit d4c4723583
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -3148,7 +3148,7 @@ Additional options:
$XCBY -xcb ............... Compile Xcb support.
$EGLFSN -no-eglfs .......... Do not compile EGLFS (EGL Full Screen/Single Surface) support.
$EGLFSY -eglfs ............. Compile EGLFS support.
$EGLFSY -eglfs ............. Compile EGLFS support (Requires OpenGL ES 2 support).
$DFBN -no-directfb ....... Do not compile DirectFB support.
$DFBY -directfb .......... Compile DirectFB support.
@ -3927,6 +3927,11 @@ if [ "$CFG_EGLFS" = "yes" ]; then
echo "The EGLFS plugin requires EGL support and cannot be built"
exit 101
fi
if [ "$CFG_OPENGL" != "es2" ]; then
echo "The EGLFS plugin requires OpenGL ES 2 support and cannot be built"
exit 101
fi
CFG_OPENGL="es2"
CFG_EGL=yes
fi
@ -4668,7 +4673,11 @@ elif [ "$CFG_OPENGL" = "desktop" ]; then
fi
if [ "$CFG_EGLFS" != "no" ]; then
CFG_EGLFS="$CFG_EGL"
if [ "$CFG_OPENGL" = "es2" ]; then
CFG_EGLFS="$CFG_EGL"
else
CFG_EGLFS="no"
fi
fi
if [ -n "$QMAKE_CFLAGS_XCB" ] || [ -n "$QMAKE_LIBS_XCB" ]; then

2
src/gui/kernel/kernel.pri
View File

@ -105,7 +105,7 @@ SOURCES += \
kernel/qplatformservices_qpa.cpp \
kernel/qplatformscreenpageflipper_qpa.cpp
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2)|contains(QT_CONFIG, egl) {
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
HEADERS += \
kernel/qplatformopenglcontext_qpa.h \
kernel/qopenglcontext.h \

2
src/gui/opengl/opengl.pri
View File

@ -4,7 +4,7 @@ contains(QT_CONFIG, opengl):CONFIG += opengl
contains(QT_CONFIG, opengles2):CONFIG += opengles2
contains(QT_CONFIG, egl):CONFIG += egl
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2)|contains(QT_CONFIG, egl) {
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \