diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:13 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:13 +0200 |
| commit | bb34372ad53e6bce00220814ef3586ba51eacc06 (patch) | |
| tree | 6021c4fb02461afe80a705c2bafaab05732e4f77 /src | |
| parent | 314fdbce8ce473eb3610be3658c61fab2fac0efb (diff) | |
| parent | 1b95298d9d5d7f39e28c1bdb14afbf24ee8a64f8 (diff) | |
Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/wayland/gl_integration/gl_integration.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri index 98517730b6..20c3aa0bd9 100644 --- a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri +++ b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri @@ -20,10 +20,10 @@ SOURCES += \ QT_WAYLAND_GL_INTEGRATION = xcomposite_egl CONFIG += xcomposite_egl } - } mac { + } else:mac { QT_WAYLAND_GL_INTEGRATION = readback_cgl CONFIG += readback_cgl - }else { + } else { isEqual(QT_WAYLAND_GL_CONFIG, readback) { QT_WAYLAND_GL_INTEGRATION = readback_glx CONFIG += readback_glx |