diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-06-28 10:36:06 +0200 |
|---|---|---|
| committer | Morten Sorvig <morten.sorvig@nokia.com> | 2011-06-28 12:14:13 +0200 |
| commit | b5b405ae72566b75038596188f18162ae28b3977 (patch) | |
| tree | a6cd3775b564d7350a60d504f34c6c36d66db3e1 /src/plugins | |
| parent | bebda38eaf18c282ba64a59033f2b611c1043d1f (diff) | |
Set mac wayland config.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/wayland/gl_integration/gl_integration.pri | 9 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 8 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri index 6652ff5fbb..98517730b6 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 9010439939..9f4563a88c 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 |