diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-05-07 03:01:52 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-05-07 12:39:12 +0200 |
| commit | 17b1705ce4c8bc9ca19a6b424a00a045134b3aac (patch) | |
| tree | 03e7b7d461064dd007179cd29da9c024e6c8f190 /src/compositor/wayland_wrapper/wayland_wrapper.pri | |
| parent | 4ab3cbcc5c4da6384e9081993c5ba24303a382bd (diff) | |
| parent | a658a10f6a42e67bd762f87851c23cc1c1e3b141 (diff) | |
| download | qtwayland-17b1705ce4c8bc9ca19a6b424a00a045134b3aac.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/client/qwaylanddisplay_p.h
src/client/qwaylandwindow.cpp
Change-Id: I50eb5c83a8b81e4bdb032b68d41f429b17d0a74d
Diffstat (limited to 'src/compositor/wayland_wrapper/wayland_wrapper.pri')
| -rw-r--r-- | src/compositor/wayland_wrapper/wayland_wrapper.pri | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri index b0c8371f..08dd38e8 100644 --- a/src/compositor/wayland_wrapper/wayland_wrapper.pri +++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri @@ -5,14 +5,12 @@ WAYLANDSERVERSOURCES += \ HEADERS += \ wayland_wrapper/qwlbuffermanager_p.h \ wayland_wrapper/qwlclientbuffer_p.h \ - wayland_wrapper/qwlregion_p.h \ - ../shared/qwaylandxkb_p.h \ + wayland_wrapper/qwlregion_p.h SOURCES += \ wayland_wrapper/qwlbuffermanager.cpp \ wayland_wrapper/qwlclientbuffer.cpp \ - wayland_wrapper/qwlregion.cpp \ - ../shared/qwaylandxkb.cpp \ + wayland_wrapper/qwlregion.cpp qtConfig(wayland-datadevice) { HEADERS += \ |