summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@theqtcompany.com>2016-03-08 14:45:49 +0100
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2016-03-08 14:45:49 +0100
commit85428526fb3e5a1605e8df2e009d333193809fae (patch)
tree08ac5d72c773b2ad9cd27a87e29c5f4055fdbf35 /.gitignore
parent95ed69bd08f424b80524414fbc0456f315353cf5 (diff)
parent19260d9846861212881e374229798b3863d1a78d (diff)
Merge remote-tracking branch 'qt/5.6' into 5.7
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 6681af4a..8ba7b05c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,7 @@ examples/wayland/server-buffer/compositor/qwayland-server-*.h
examples/wayland/server-buffer/compositor/*-server-protocol.h
examples/wayland/server-buffer/compositor/*-protocol.c
examples/wayland/subsurface/subsurface
-src/client/qwayland*.cpp
+src/client/qwayland-*.cpp
src/client/*-protocol.c
src/client/QtWaylandClient.version
src/client/QtWaylandClient.version.in