Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor

2011-07-06 14:08:13 +02:00 · 2011-07-06 14:08:13 +02:00 · bb34372ad5
commit bb34372ad5
parent 314fdbce8c 1b95298d9d
1 changed files with 2 additions and 2 deletions
--- 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