diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-10-31 08:42:58 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-11-30 12:47:16 +0100 |
| commit | 17c76f2e8df43cf40e629bdde170ce2392e5be92 (patch) | |
| tree | 0b9b5b8af8764281d6b7a848ccb560a95acd180d /src/plugins/platforms/wayland/wayland.pro | |
| parent | 33d06a071c72998241654952322a58ce888a1f16 (diff) | |
Added data objects
ie. new clipboard and dnd protocol
Change-Id: I0ebdc6dc2972b6cb1dc882cd6b6f4ddde2621186
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'src/plugins/platforms/wayland/wayland.pro')
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index 7bbcb01ab..3df4cb737 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -12,11 +12,6 @@ mac { DEFINES += QT_NO_WAYLAND_XKB } -QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG) -isEqual(QT_WAYLAND_GL_CONFIG, wayland_egl) { - DEFINES += QT_NO_WAYLAND_XKB -} - QT += core-private gui-private opengl-private platformsupport-private SOURCES = main.cpp \ @@ -31,7 +26,9 @@ SOURCES = main.cpp \ qwaylandshmwindow.cpp \ qwaylandclipboard.cpp \ qwaylanddnd.cpp \ - qwaylandmime.cpp + qwaylanddataoffer.cpp \ + qwaylanddatadevicemanager.cpp \ + qwaylanddatasource.cpp HEADERS = qwaylandintegration.h \ qwaylandnativeinterface.h \ @@ -44,7 +41,9 @@ HEADERS = qwaylandintegration.h \ qwaylandshmwindow.h \ qwaylandclipboard.h \ qwaylanddnd.h \ - qwaylandmime.h + qwaylanddataoffer.h \ + qwaylanddatadevicemanager.h \ + qwaylanddatasource.h INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND LIBS += $$QMAKE_LIBS_WAYLAND @@ -59,3 +58,4 @@ INSTALLS += target include ($$PWD/gl_integration/gl_integration.pri) include ($$PWD/windowmanager_integration/windowmanager_integration.pri) + |