summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@digia.com>2013-09-09 13:58:40 +0200
committerAndy Nichols <andy.nichols@digia.com>2013-09-09 13:58:40 +0200
commit82b7f6faed8961acc07ff6ee56236d001000f149 (patch)
tree75d9acd9aba89b927021196d7be8922ad83bece1 /.gitignore
parentaa0584194b5fe3dd01830dbaed231dabfa6d455d (diff)
parent330c429991ef1c32ffdd51cdc8627ef1b71604b3 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: qtwayland.pro src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp src/plugins/platforms/wayland_common/qwaylandshellsurface.h src/plugins/platforms/wayland_common/qwaylandwindow.cpp src/plugins/platforms/wayland_common/qwaylandwindow.h Change-Id: Ifa9bc553d826b893b054bbaef5ea3fc3013de3df
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8ad1f2ed..0aac8cc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,16 +24,23 @@ moc_*.cpp
mkspecs/
lib/
include/
+bin/
/plugins/
examples/qml-compositor/qml-compositor
examples/qwidget-compositor/qwidget-compositor
examples/qwindow-compositor/qwindow-compositor
src/compositor/*-server-protocol.h
src/compositor/*-protocol.c
+src/compositor/qwayland-server-*.cpp
+src/compositor/qwayland-server-*.h
src/plugins/platforms/*/*-client-protocol.h
src/plugins/platforms/*/*-protocol.c
+src/plugins/platforms/*/qwayland-*.cpp
+src/plugins/platforms/*/qwayland-*.h
src/plugins/waylandcompositors/*/*-server-protocol.h
src/plugins/waylandcompositors/*/*-protocol.c
+src/plugins/waylandcompositors/*/qwayland-server-*.cpp
+src/plugins/waylandcompositors/*/qwayland-server-*.h
src/plugins/platforms/wayland_common/libwayland_common.a
src/plugins/platforms/wayland_common/libwayland_common.prl
tests/auto/client/tst_client