summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2013-02-12 22:52:56 +0100
committerAndy Nichols <andy.nichols@digia.com>2013-02-13 15:28:29 +0100
commit6c40c04743b082171d5c8a1a6d641034904d7119 (patch)
treec661be75fab397a82c102204cd02adb018932457 /.gitignore
parentbca154390bd9817b6f1d36f4366a6165e1eca311 (diff)
Ignore generated files
Due to the recent changes, the number of generated files increased. Add the new generated files to the ignore list. Change-Id: I9a240ee613eaeb8d48d07e6126a384af2ab6354e Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore19
1 files changed, 16 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index c0ad159d..cc90f216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,12 +6,16 @@ Makefile*
*.o
*.moc
.qmake.cache
+config.log
config.tests/egl/egl
config.tests/glx/glx
config.tests/wayland_egl/wayland_egl
config.tests/xcomposite/xcomposite
config.tests/xkbcommon/xkbcommon
config.tests/wayland/wayland
+config.tests/wayland_scanner/wayland_scanner
+config.tests/wayland_scanner/*-client-protocol.h
+config.tests/wayland_scanner/*-protocol.c
qrc_*.cpp
moc_*.cpp
.obj/
@@ -19,8 +23,17 @@ moc_*.cpp
mkspecs/
lib/
include/
-src/compositor/qtcompositorversion.h
+/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/plugins/platforms/wayland/*-client-protocol.h
-src/plugins/platforms/wayland/*-protocol.c
+src/plugins/platforms/*/*-client-protocol.h
+src/plugins/platforms/*/*-protocol.c
+src/plugins/waylandcompositors/*/*-server-protocol.h
+src/plugins/waylandcompositors/*/*-protocol.c
+src/plugins/platforms/wayland_common/libwayland_common.a
+src/plugins/platforms/wayland_common/libwayland_common.prl
+tests/auto/client/tst_client
+tests/auto/compositor/tst_compositor