Change-Id: Ib65990c6895ab32fda62703e6aec9afb39f6256c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-contains(QT_CONFIG, opengl) {
+QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
+contains(QT_CONFIG, opengl):!equals(QT_WAYLAND_GL_CONFIG, nogl) {
+
DEFINES += QT_WAYLAND_GL_SUPPORT
DEFINES += QT_WAYLAND_GL_SUPPORT
-HEADERS += \
- $$PWD/qwaylandglintegration.h
+ HEADERS += \
+ $$PWD/qwaylandglintegration.h
-SOURCES += \
- $$PWD/qwaylandglintegration.cpp
+ SOURCES += \
+ $$PWD/qwaylandglintegration.cpp
- QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
contains(QT_CONFIG, opengles2) {
isEqual(QT_WAYLAND_GL_CONFIG, xcomposite_egl) {
QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
contains(QT_CONFIG, opengles2) {
isEqual(QT_WAYLAND_GL_CONFIG, xcomposite_egl) {
QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
#ifdef QT_WAYLAND_GL_SUPPORT
return mDisplay->eglIntegration()->createPlatformOpenGLContext(context->format(), context->shareHandle());
#else
#ifdef QT_WAYLAND_GL_SUPPORT
return mDisplay->eglIntegration()->createPlatformOpenGLContext(context->format(), context->shareHandle());
#else
- Q_UNUSED(glFormat);
- Q_UNUSED(share);