Fix no-opengl build with egl
Disable eglfs and similar plugins when opengl is not enabled. (but egl is present) GL-dependent parts of eglconvenience need to be skipped too. Task-number: QTBUG-37457 Change-Id: I44d49495241551bc7b1f565aa0b5ace9f310628e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>bb10
parent
ac178eae4e
commit
2861a4d109
|
|
@ -5411,7 +5411,7 @@ if [ "$CFG_EGL" != "no" ]; then
|
|||
fi
|
||||
|
||||
if [ "$CFG_EGLFS" != "no" ]; then
|
||||
if [ "$XPLATFORM_QNX" = "no" ]; then
|
||||
if [ "$XPLATFORM_QNX" = "no" ] && [ "$CFG_OPENGL" != "no" ]; then
|
||||
CFG_EGLFS="$CFG_EGL"
|
||||
else
|
||||
CFG_EGLFS="no"
|
||||
|
|
|
|||
|
|
@ -1,30 +1,33 @@
|
|||
contains(QT_CONFIG,egl) {
|
||||
HEADERS += \
|
||||
$$PWD/qeglconvenience_p.h \
|
||||
$$PWD/qeglplatformcontext_p.h \
|
||||
$$PWD/qeglpbuffer_p.h
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/qeglconvenience.cpp \
|
||||
$$PWD/qeglplatformcontext.cpp \
|
||||
$$PWD/qeglpbuffer.cpp
|
||||
|
||||
unix {
|
||||
HEADERS += \
|
||||
$$PWD/qeglplatformcursor_p.h \
|
||||
$$PWD/qeglplatformwindow_p.h \
|
||||
$$PWD/qeglplatformscreen_p.h \
|
||||
$$PWD/qeglcompositor_p.h \
|
||||
$$PWD/qeglplatformbackingstore_p.h \
|
||||
$$PWD/qeglplatformintegration_p.h
|
||||
contains(QT_CONFIG,opengl) {
|
||||
HEADERS += $$PWD/qeglplatformcontext_p.h
|
||||
SOURCES += $$PWD/qeglplatformcontext.cpp
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/qeglplatformcursor.cpp \
|
||||
$$PWD/qeglplatformwindow.cpp \
|
||||
$$PWD/qeglplatformscreen.cpp \
|
||||
$$PWD/qeglcompositor.cpp \
|
||||
$$PWD/qeglplatformbackingstore.cpp \
|
||||
$$PWD/qeglplatformintegration.cpp
|
||||
unix {
|
||||
HEADERS += \
|
||||
$$PWD/qeglplatformcursor_p.h \
|
||||
$$PWD/qeglplatformwindow_p.h \
|
||||
$$PWD/qeglplatformscreen_p.h \
|
||||
$$PWD/qeglcompositor_p.h \
|
||||
$$PWD/qeglplatformbackingstore_p.h \
|
||||
$$PWD/qeglplatformintegration_p.h
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/qeglplatformcursor.cpp \
|
||||
$$PWD/qeglplatformwindow.cpp \
|
||||
$$PWD/qeglplatformscreen.cpp \
|
||||
$$PWD/qeglcompositor.cpp \
|
||||
$$PWD/qeglplatformbackingstore.cpp \
|
||||
$$PWD/qeglplatformintegration.cpp
|
||||
}
|
||||
}
|
||||
|
||||
# Avoid X11 header collision
|
||||
|
|
|
|||
Loading…
Reference in New Issue