From: Morten Sorvig <morten.sorvig@nokia.com>
Date: Tue, 28 Jun 2011 08:36:06 +0000 (+0200)
Subject: Set mac wayland config.
X-Git-Tag: qt-v5.0.0-alpha1~3626^2~291
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5b405ae72566b75038596188f18162ae28b3977;p=profile%2Fivi%2Fqtbase.git

Set mac wayland config.
---

diff --git a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
index 6652ff5..9851773 100644
--- a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
+++ b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
@@ -20,7 +20,10 @@ SOURCES += \
             QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
             CONFIG += xcomposite_egl
         }
-    } else {
+    } mac {
+        QT_WAYLAND_GL_INTEGRATION = readback_cgl
+        CONFIG += readback_cgl
+    }else {
         isEqual(QT_WAYLAND_GL_CONFIG, readback) {
             QT_WAYLAND_GL_INTEGRATION = readback_glx
             CONFIG += readback_glx
@@ -46,6 +49,10 @@ readback_glx {
     include ($$PWD/readback_glx/readback_glx.pri)
 }
 
+readback_cgl {
+    include ($$PWD/readback_cgl/readback_cgl.pri)
+}
+
 xcomposite_glx {
     include ($$PWD/xcomposite_glx/xcomposite_glx.pri)
 }
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 9010439..9f4563a 100644
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -8,6 +8,10 @@ DESTDIR = $$QT.gui.plugins/platforms
 DEFINES += Q_PLATFORM_WAYLAND
 DEFINES += $$QMAKE_DEFINES_WAYLAND
 
+mac {
+    DEFINES += QT_NO_WAYLAND_XKB
+}
+
 QT += core-private gui-private opengl-private platformsupport-private
 
 SOURCES =   main.cpp \
@@ -35,6 +39,10 @@ HEADERS =   qwaylandintegration.h \
 
 INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND
 LIBS += $$QMAKE_LIBS_WAYLAND
+mac {
+    LIBS += -lwayland-client
+}
+
 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms