AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable autodetecting of EGL event for desktop GL

Browse Source 
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>
This commit is contained in:
Jorgen Lind 2012-09-07 16:36:49 +02:00 committed by Qt by Nokia
parent 942180e8da
commit e54f6ed87b
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -4867,7 +4867,7 @@ else
fi fi
# EGL Support # 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 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_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` QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null`

5
src/platformsupport/eglconvenience/eglconvenience.pri
View File

@ -1,12 +1,10 @@
contains(QT_CONFIG,opengles2) { contains(QT_CONFIG,egl) {
contains(QT_CONFIG,egl) {
HEADERS += \ HEADERS += \
$$PWD/qeglconvenience_p.h \ $$PWD/qeglconvenience_p.h \
$$PWD/qeglplatformcontext_p.h $$PWD/qeglplatformcontext_p.h
SOURCES += \ SOURCES += \
$$PWD/qeglconvenience.cpp \ $$PWD/qeglconvenience.cpp \
$$PWD/qeglplatformcontext.cpp $$PWD/qeglplatformcontext.cpp
}
contains(QT_CONFIG,xlib) { contains(QT_CONFIG,xlib) {
HEADERS += \ HEADERS += \
@ -15,3 +13,4 @@ contains(QT_CONFIG,opengles2) {
$$PWD/qxlibeglintegration.cpp $$PWD/qxlibeglintegration.cpp
} }
} }