From 695be6cd3cf403a6facebaf095300abaf7a70457 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sat, 29 Dec 2018 14:52:43 +0100 Subject: Clean up .gitignore Ignore more files resulting from the build process. Glob all scanner generated files, and add exceptions for pregenerated files. Change-Id: Ica60951356bdc145ebd66f5e6fc6bf4e23f2aa72 Reviewed-by: Johan Helsing --- .gitignore | 24 +++++----------------- .../extensions/pregenerated/3rdparty/.gitignore | 3 +++ .../xdg-shell-v5/pregenerated/3rdparty/.gitignore | 3 +++ 3 files changed, 11 insertions(+), 19 deletions(-) create mode 100644 src/compositor/extensions/pregenerated/3rdparty/.gitignore create mode 100644 src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/.gitignore diff --git a/.gitignore b/.gitignore index b1a806210..b337d343b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,8 @@ Makefile* *.moc *_wrapper.sh .qmake.stash -qwayland-server-*.cpp -qwayland-server-*.h +qwayland-*.cpp +qwayland-*.h *-protocol.c *-client-protocol.h *-server-protocol.h @@ -45,32 +45,18 @@ examples/wayland/minimal-qml/minimal-qml 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 examples/wayland/server-buffer/compositor/compositor +examples/wayland/server-side-decoration/server-side-decoration examples/wayland/subsurface/subsurface examples/wayland/spanning-screens/spanning-screens -src/client/qwayland-*.cpp src/client/QtWaylandClient.version src/client/QtWaylandClient.version.in src/compositor/QtWaylandCompositor.version src/compositor/QtWaylandCompositor.version.in -src/plugins/platforms/*/qwayland-*.cpp -src/plugins/platforms/*/qwayland-*.h src/plugins/platforms/wayland_common/libwayland_common.a src/plugins/platforms/wayland_common/libwayland_common.prl -src/plugins/hardwareintegration/*/*/qwayland*.cpp -src/plugins/hardwareintegration/*/*/qwayland*.h -src/plugins/shellintegration/ivi-shell/qwayland-ivi-application.h -src/plugins/shellintegration/ivi-shell/qwayland-ivi-application.cpp -src/plugins/shellintegration/ivi-shell/qwayland-ivi-controller.h -src/plugins/shellintegration/ivi-shell/qwayland-ivi-controller.cpp -src/plugins/shellintegration/fullscreen-shell-v1/qwayland-fullscreen-shell-unstable-v1.cpp -src/plugins/shellintegration/fullscreen-shell-v1/qwayland-fullscreen-shell-unstable-v1.h src/imports/compositor/compositor.qrc -tests/auto/client/client/tst_client -tests/auto/client/fullscreenshellv1/tst_client_fullscreenshell1 +tests/auto/client/*/tst_* +!tests/auto/client/*/tst_*.cpp tests/auto/compositor/compositor/tst_compositor -tests/auto/compositor/compositor/qwayland-*.cpp -tests/auto/compositor/compositor/qwayland-*.h *~ diff --git a/src/compositor/extensions/pregenerated/3rdparty/.gitignore b/src/compositor/extensions/pregenerated/3rdparty/.gitignore new file mode 100644 index 000000000..db253cfaf --- /dev/null +++ b/src/compositor/extensions/pregenerated/3rdparty/.gitignore @@ -0,0 +1,3 @@ +!qwayland-server-*.cpp +!qwayland-server-*.h +!wayland-*-protocol.cpp diff --git a/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/.gitignore b/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/.gitignore new file mode 100644 index 000000000..6a2d3c207 --- /dev/null +++ b/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/.gitignore @@ -0,0 +1,3 @@ +!qwayland-*.cpp +!qwayland-*.h +!wayland-*-protocol.c -- cgit v1.2.3