diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index b337d343b..4262e83ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ .*.callgrind.out.* Makefile* -*.pro.user* -*.qmlproject.user* .*.swp *.o *.moc @@ -20,7 +18,6 @@ config.tests/egl/egl config.tests/glx/glx config.tests/wayland_cursor/wayland_cursor config.tests/wayland_egl/wayland_egl -config.tests/xcomposite/xcomposite config.tests/xkbcommon/xkbcommon config.tests/wayland/wayland config.tests/drm_egl_server/drm_egl_server @@ -43,7 +40,7 @@ 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/fancy-compositor/fancy-compositor examples/wayland/server-buffer/client/client examples/wayland/server-buffer/compositor/compositor examples/wayland/server-side-decoration/server-side-decoration @@ -55,8 +52,12 @@ src/compositor/QtWaylandCompositor.version src/compositor/QtWaylandCompositor.version.in src/plugins/platforms/wayland_common/libwayland_common.a src/plugins/platforms/wayland_common/libwayland_common.prl -src/imports/compositor/compositor.qrc tests/auto/client/*/tst_* !tests/auto/client/*/tst_*.cpp tests/auto/compositor/compositor/tst_compositor *~ + +# Qt Creator generated files +*.pro.user* +*.qmlproject.user* +CMakeLists.txt.user* |