diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-11 10:19:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-11 10:50:02 +0200 |
| commit | 33ad940cddf0a9529f205fe645f1b1d76f6f04f1 (patch) | |
| tree | 72751567959407b3c50dc92c56529e6159099ce7 /src/client/client.pro | |
| parent | 061ed4599dd2b384e4ef74b297640bf4e92f7f43 (diff) | |
| parent | 1bc3b0fdc8d934c1ab69a902054681896b56d672 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/client/qwaylanddisplay.cpp
src/client/qwaylanddisplay_p.h
src/client/qwaylandxdgpopup_p.h
Change-Id: If86ea09971773dc6c541f07819459a90e8ab73a0
Diffstat (limited to 'src/client/client.pro')
| -rw-r--r-- | src/client/client.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 994cf5443..8be00c7ac 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -58,8 +58,11 @@ SOURCES += qwaylandintegration.cpp \ qwaylanddatasource.cpp \ qwaylandshellsurface.cpp \ qwaylandwlshellsurface.cpp \ + qwaylandwlshellintegration.cpp \ qwaylandxdgshell.cpp \ qwaylandxdgsurface.cpp \ + qwaylandxdgpopup_p.cpp \ + qwaylandxdgshellintegration.cpp \ qwaylandextendedsurface.cpp \ qwaylandsubsurface.cpp \ qwaylandtouch.cpp \ @@ -93,8 +96,11 @@ HEADERS += qwaylandintegration_p.h \ qwaylanddatasource_p.h \ qwaylandshellsurface_p.h \ qwaylandwlshellsurface_p.h \ + qwaylandwlshellintegration_p.h \ qwaylandxdgshell_p.h \ qwaylandxdgsurface_p.h \ + qwaylandxdgpopup_p.h \ + qwaylandxdgshellintegration_p.h \ qwaylandextendedsurface_p.h \ qwaylandsubsurface_p.h \ qwaylandtouch_p.h \ |