diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-11 08:41:40 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-11 11:58:59 (GMT) |
| commit | f067aa05c030fd02d46f10ab2023059978b4f816 (patch) | |
| tree | 591383dd7f04215e8a98cacc560b0ff0e4ab0141 /src/plugins/platforms | |
| parent | f5f4e258a989e05fe89a4294db85c8513b24a04a (diff) | |
| download | Qt-f067aa05c030fd02d46f10ab2023059978b4f816.zip Qt-f067aa05c030fd02d46f10ab2023059978b4f816.tar.gz Qt-f067aa05c030fd02d46f10ab2023059978b4f816.tar.bz2 | |
Make the xcomposite the default gl integration backend
The others can be opted in with the environment variable:
QT_WAYLAND_GL_CONFIG
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/wayland/gl_integration/gl_integration.pri | 30 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 17 |
2 files changed, 31 insertions, 16 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri index 835f880..d9b5fa9 100644 --- a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri +++ b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri @@ -1,3 +1,7 @@ +contains(QT_CONFIG, opengl) { + DEFINES += QT_WAYLAND_GL_SUPPORT + QT += opengl + HEADERS += \ $$PWD/qwaylandglintegration.h \ $$PWD/qwaylandglwindowsurface.h @@ -6,6 +10,32 @@ SOURCES += \ $$PWD/qwaylandglintegration.cpp \ $$PWD/qwaylandglwindowsurface.cpp + QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG) + contains(QT_CONFIG, opengles2) { + isEqual(QT_WAYLAND_GL_CONFIG, wayland_egl) { + QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG + CONFIG += wayland_egl + } else:isEqual(QT_WAYLAND_GL_CONFIG,readback) { + QT_WAYLAND_GL_INTEGRATION = readback_egl + CONFIG += readback_egl + } else { + QT_WAYLAND_GL_INTEGRATION = xcomposite_egl + CONFIG += xcomposite_egl + } + } else { + isEqual(QT_WAYLAND_GL_CONFIG, readback) { + QT_WAYLAND_GL_INTEGRATION = readback_glx + CONFIG += readback_glx + } else { + QT_WAYLAND_GL_INTEGRATION = xcomposite_glx + CONFIG += xcomposite_glx + } + } + + message("Wayland GL Integration: $$QT_WAYLAND_GL_INTEGRATION") +} + + wayland_egl { include ($$PWD/wayland_egl/wayland_egl.pri) } diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index ae17a14..5945438 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -31,22 +31,7 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND INCLUDEPATH += $$PWD -contains(QT_CONFIG, opengl) { - DEFINES += QT_WAYLAND_GL_SUPPORT - QT += opengl - - contains(QT_CONFIG, opengles2) { - CONFIG += wayland_egl - #CONFIG += readback_egl - #CONFIG += xcomposite_egl - } else { - CONFIG += readback_glx - #CONFIG += xcomposite_gl - - } - - include ($$PWD/gl_integration/gl_integration.pri) -} +include ($$PWD/gl_integration/gl_integration.pri) include (../fontdatabases/genericunix/genericunix.pri) |