AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set mac wayland config.

Browse Source
This commit is contained in:
Morten Sorvig 2011-06-28 10:36:06 +02:00
parent bebda38eaf
commit b5b405ae72
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/platforms/wayland/gl_integration/gl_integration.pri
View File

@ -20,7 +20,10 @@ SOURCES += \
QT_WAYLAND_GL_INTEGRATION = xcomposite_egl QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
CONFIG += xcomposite_egl CONFIG += xcomposite_egl
} }
} else { } mac {
QT_WAYLAND_GL_INTEGRATION = readback_cgl
CONFIG += readback_cgl
}else {
isEqual(QT_WAYLAND_GL_CONFIG, readback) { isEqual(QT_WAYLAND_GL_CONFIG, readback) {
QT_WAYLAND_GL_INTEGRATION = readback_glx QT_WAYLAND_GL_INTEGRATION = readback_glx
CONFIG += readback_glx CONFIG += readback_glx
@ -46,6 +49,10 @@ readback_glx {
include ($$PWD/readback_glx/readback_glx.pri) include ($$PWD/readback_glx/readback_glx.pri)
} }
readback_cgl {
include ($$PWD/readback_cgl/readback_cgl.pri)
}
xcomposite_glx { xcomposite_glx {
include ($$PWD/xcomposite_glx/xcomposite_glx.pri) include ($$PWD/xcomposite_glx/xcomposite_glx.pri)
} }

8
src/plugins/platforms/wayland/wayland.pro
View File

@ -8,6 +8,10 @@ DESTDIR = $$QT.gui.plugins/platforms
DEFINES += Q_PLATFORM_WAYLAND DEFINES += Q_PLATFORM_WAYLAND
DEFINES += $$QMAKE_DEFINES_WAYLAND DEFINES += $$QMAKE_DEFINES_WAYLAND
mac {
DEFINES += QT_NO_WAYLAND_XKB
}
QT += core-private gui-private opengl-private platformsupport-private QT += core-private gui-private opengl-private platformsupport-private
SOURCES = main.cpp \ SOURCES = main.cpp \
@ -35,6 +39,10 @@ HEADERS = qwaylandintegration.h \
INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND
LIBS += $$QMAKE_LIBS_WAYLAND LIBS += $$QMAKE_LIBS_WAYLAND
mac {
LIBS += -lwayland-client
}
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
target.path += $$[QT_INSTALL_PLUGINS]/platforms target.path += $$[QT_INSTALL_PLUGINS]/platforms