diff options
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | src/gui/kernel/kernel.pri | 2 | ||||
| -rw-r--r-- | src/gui/opengl/opengl.pri | 2 |
3 files changed, 13 insertions, 4 deletions
@@ -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 diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index b0fe871741..3c1b6b4e48 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -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 \ diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index f0d9000fb6..3becc2bcfe 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -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 \ |