summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-12-02 14:00:44 +0100
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-12-02 14:01:08 +0100
commit05bf419b206f3cd078364cf67af2df4e4d1477c0 (patch)
treec942e884e8f75a29bd9f281c993fbc85a0b832ed /.gitignore
parentdd5e1ffd3e9e379574325193c8546d453c11303e (diff)
parent3698b116a1973146b76319673cdb6787f13f2de6 (diff)
Merge branch 'wip-compositor-api' into dev
This introduces the new compositor API, removing the old API (which was never officially supported). Change-Id: I1dc01f0fb4edc749e34ed8356e56ad87d7d64913
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore11
1 files changed, 9 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 7c685024..e7ba647b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,9 +27,11 @@ lib/
include/
bin/
/plugins/
-examples/wayland/qml-compositor/qml-compositor
-examples/wayland/qwidget-compositor/qwidget-compositor
+/qml/
examples/wayland/qwindow-compositor/qwindow-compositor
+examples/wayland/custom-extension/testapp/testapp
+examples/wayland/multi-output/multi-output
+examples/wayland/pure-qml/pure-qml
examples/wayland/server-buffer/client/client
examples/wayland/server-buffer/client/qwayland-*.cpp
examples/wayland/server-buffer/client/qwayland-*.h
@@ -43,10 +45,14 @@ examples/wayland/server-buffer/compositor/*-protocol.c
examples/wayland/subsurface/subsurface
src/client/qwayland*.cpp
src/client/*-protocol.c
+src/client/QtWaylandClient.version
+src/client/QtWaylandClient.version.in
src/compositor/*-server-protocol.h
src/compositor/*-protocol.c
src/compositor/qwayland-server-*.cpp
src/compositor/qwayland-server-*.h
+src/compositor/QtWaylandCompositor.version
+src/compositor/QtWaylandCompositor.version.in
src/plugins/platforms/*/*-client-protocol.h
src/plugins/platforms/*/*-protocol.c
src/plugins/platforms/*/qwayland-*.cpp
@@ -62,6 +68,7 @@ src/plugins/hardwareintegration/*/*/qwayland*.h
src/plugins/hardwareintegration/*/*/*-server-protocol.h
src/plugins/hardwareintegration/*/*/*-client-protocol.h
src/plugins/hardwareintegration/*/*/*-protocol.c
+src/imports/compositor/compositor.qrc
tests/auto/client/tst_client
tests/auto/compositor/tst_compositor
*~