diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-12-05 17:09:02 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-12-07 09:58:35 +0100 |
| commit | 4c89518228012ddc3602eab405e4b5fb8108fcdf (patch) | |
| tree | 615d4fdc38999e408d52998c39760064d223b652 /src/plugins/platforms/wayland/gl_integration/gl_integration.pri | |
| parent | 542eca71e074b5110df2aaf822449bf7d6ec2b91 (diff) | |
Make wayland actually a module
Also fix so that QtCompositor can be built as shared object.
+ fix so that the default QT_WAYLAND_GL_CONFIG is wayland_egl
Change-Id: I02b72e99286584426bd37ab2d00bbc84af11efdc
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'src/plugins/platforms/wayland/gl_integration/gl_integration.pri')
| -rw-r--r-- | src/plugins/platforms/wayland/gl_integration/gl_integration.pri | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri index 20c3aa0bd..8b41f2121 100644 --- a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri +++ b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri @@ -10,15 +10,15 @@ SOURCES += \ 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 + isEqual(QT_WAYLAND_GL_CONFIG, xcomposite_egl) { + QT_WAYLAND_GL_INTEGRATION = xcomposite_egl + CONFIG += xcomposite_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 + QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG + CONFIG += wayland_egl } } else:mac { QT_WAYLAND_GL_INTEGRATION = readback_cgl |