Enable autodetecting of EGL event for desktop GL

And only use the QT_CONFIG,egl syntax in eglconvenience

Change-Id: I81c0602334714f4b27a7e90e7b5859c989e6bd63
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>

diff --git a/configure b/configure
index 5ea2229..b20c2e0 100755 (executable)
--- a/configure
+++ b/configure
@@ -4867,7 +4867,7 @@ else
 fi
 
 # EGL Support
-if [ "$CFG_EGL" != "no" ] && [ "$CFG_OPENGL" != "desktop" ]; then
+if [ "$CFG_EGL" != "no" ]; then
     if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then
         QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
         QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null`

diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
index db3ec20..188eb1c 100644 (file)
--- a/src/platformsupport/eglconvenience/eglconvenience.pri
+++ b/src/platformsupport/eglconvenience/eglconvenience.pri
@@ -1,12 +1,10 @@
-contains(QT_CONFIG,opengles2) {
-    contains(QT_CONFIG,egl) {
-        HEADERS += \
-            $$PWD/qeglconvenience_p.h \
-            $$PWD/qeglplatformcontext_p.h
-        SOURCES += \
-            $$PWD/qeglconvenience.cpp \
-            $$PWD/qeglplatformcontext.cpp
-    }
+contains(QT_CONFIG,egl) {
+    HEADERS += \
+        $$PWD/qeglconvenience_p.h \
+        $$PWD/qeglplatformcontext_p.h
+    SOURCES += \
+        $$PWD/qeglconvenience.cpp \
+        $$PWD/qeglplatformcontext.cpp
 
     contains(QT_CONFIG,xlib) {
         HEADERS += \
@@ -15,3 +13,4 @@ contains(QT_CONFIG,opengles2) {
             $$PWD/qxlibeglintegration.cpp
     }
 }
+