diff options
| author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-11-07 14:43:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-15 18:46:38 +0100 |
| commit | 4613291e8c1717d8d3316b2c0b1f2c6c96bdc56f (patch) | |
| tree | d815d5dc56c46361146b2ee3ce2b6c2a2cc2c6bb /src/client/client.pro | |
| parent | 23ecb57e11bea42c2e90d280b21b6ee448a9afff (diff) | |
| parent | 7882407bb6bab6c042fd20592a63a875b74eb581 (diff) | |
Merge branch '5.4' into dev
Merge done by Giulio Camuffo
Conflicts:
src/client/client.pro
src/client/qwaylanddisplay.cpp
src/client/qwaylandinputdevice.cpp
src/client/qwaylandinputdevice_p.h
src/client/qwaylandwindow.cpp
src/compositor/compositor_api/qwaylandsurface.cpp
src/compositor/compositor_api/qwaylandsurface_p.h
src/compositor/wayland_wrapper/qwlsurface.cpp
Change-Id: I1df878bb54f49d953c51215a2772869e261ebe81
Diffstat (limited to 'src/client/client.pro')
| -rw-r--r-- | src/client/client.pro | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 22271ee45..ef3cff054 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -5,7 +5,8 @@ QT_FOR_PRIVATE += platformsupport-private MODULE=waylandclient MODULE_PLUGIN_TYPES = \ wayland-graphics-integration-client \ - wayland-inputdevice-integration + wayland-inputdevice-integration \ + wayland-decoration-client load(qt_module) @@ -71,7 +72,9 @@ SOURCES += qwaylandintegration.cpp \ qwaylandtouch.cpp \ qwaylandqtkey.cpp \ ../shared/qwaylandmimehelper.cpp \ - qwaylanddecoration.cpp \ + qwaylandabstractdecoration.cpp \ + qwaylanddecorationfactory.cpp \ + qwaylanddecorationplugin.cpp \ qwaylandeventthread.cpp\ qwaylandwindowmanagerintegration.cpp \ qwaylandinputcontext.cpp \ @@ -102,7 +105,9 @@ HEADERS += qwaylandintegration_p.h \ qwaylandtouch_p.h \ qwaylandqtkey_p.h \ ../shared/qwaylandmimehelper.h \ - qwaylanddecoration_p.h \ + qwaylandabstractdecoration_p.h \ + qwaylanddecorationfactory_p.h \ + qwaylanddecorationplugin_p.h \ qwaylandeventthread_p.h \ qwaylandwindowmanagerintegration_p.h \ qwaylandinputcontext_p.h \ |