summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2016-10-01 09:19:57 +0200
committerPier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>2016-10-01 09:33:42 +0000
commit2cfefb35b755e1489aff1a3c427d781e8b887223 (patch)
treea52c54efac7dc64cf2aff9d713e5bf69b9ebf3e1 /.gitignore
parentb585ff36ffeb62eec8513a51b01fa53b1e489725 (diff)
Update git ignore list
Change-Id: I923d42ecc85e798d8f848cd77f847e2a7c9a9559 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore11
1 files changed, 7 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index bdf2bb8e..b841728f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ Makefile*
*.o
*.moc
*_wrapper.sh
+.qmake.stash
qwayland-server-*.cpp
qwayland-server-*.h
*-protocol.c
@@ -35,6 +36,7 @@ bin/
examples/wayland/qwindow-compositor/qwindow-compositor
examples/wayland/custom-extension/testapp/testapp
examples/wayland/minimal-cpp/minimal-cpp
+examples/wayland/minimal-qml/minimal-qml
examples/wayland/multi-output/multi-output
examples/wayland/pure-qml/pure-qml
examples/wayland/server-buffer/client/client
@@ -42,6 +44,7 @@ examples/wayland/server-buffer/client/qwayland-*.cpp
examples/wayland/server-buffer/client/qwayland-*.h
examples/wayland/server-buffer/compositor/compositor
examples/wayland/subsurface/subsurface
+examples/wayland/spanning-screens/spanning-screens
src/client/qwayland-*.cpp
src/client/QtWaylandClient.version
src/client/QtWaylandClient.version.in
@@ -58,8 +61,8 @@ 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/imports/compositor/compositor.qrc
-tests/auto/client/tst_client
-tests/auto/compositor/tst_compositor
-tests/auto/compositor/qwayland-*.cpp
-tests/auto/compositor/qwayland-*.h
+tests/auto/client/client/tst_client
+tests/auto/compositor/compositor/tst_compositor
+tests/auto/compositor/compositor/qwayland-*.cpp
+tests/auto/compositor/compositor/qwayland-*.h
*~