summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2015-11-25 19:36:24 +0100
committerPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2015-11-28 14:45:30 +0000
commit02fa8b9ef89b6874effea8d219bcbba0319a263c (patch)
tree75084dcf7eb802401cbac902afe773576f71bfd2 /.gitignore
parentc7a07657f2f668b78591065c34f4dd151f3e1a7a (diff)
Update git ignore list
Change-Id: I60548698d8b6ba68cdf1a4069424f8709f153550 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore11
1 files changed, 9 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index b33ca907..270d228f 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
@@ -42,10 +44,14 @@ examples/wayland/server-buffer/compositor/*-server-protocol.h
examples/wayland/server-buffer/compositor/*-protocol.c
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
@@ -61,6 +67,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
*~