diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/platformsupport/eglconvenience/eglconvenience.pri | 17 |
2 files changed, 9 insertions, 10 deletions
@@ -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 db3ec20685..188eb1ce64 100644 --- 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 } } + |