diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-28 10:09:27 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@gmail.com> | 2016-08-28 10:12:09 +0200 |
| commit | b0c416dede8b6ca596eb2a13361d98613e8c9533 (patch) | |
| tree | adddaa3622e0013858355ad6994c8e6e892ce254 /src/client/client.pro | |
| parent | 9610eccdf237c5ffc21630cee9c364d0fe871901 (diff) | |
| parent | ae9bfd29b42156fb8f04dfa60b9e48ce10ebacb8 (diff) | |
Merge remote-tracking branch 'qt/5.7' into 5.8v5.8.0-alpha1
Conflicts:
src/compositor/compositor_api/qwaylandseat.cpp
src/compositor/compositor_api/qwaylandview.cpp
tests/auto/compositor/compositor.pro
tests/auto/compositor/compositor/testinputdevice.cpp
tests/auto/compositor/compositor/testinputdevice.h
tests/auto/compositor/testinputdevice.cpp
tests/auto/compositor/testinputdevice.h
tests/auto/compositor/testseat.cpp
tests/auto/compositor/testseat.h
Change-Id: I98e045908dd964e5d4120bd35e71b8839c0d923a
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 63012c127..fa2036745 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 \ |