summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-07-02 13:23:36 +0200
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-07-07 09:29:22 +0200
commit82f01cc931ef5ed0a77f389666c8071c5c0c4b59 (patch)
treed0122af4ce4ad1636a0bbdae2ac9989f4dfe11c3 /.gitignore
parentb9f87cf832f83bdce21e47a2af6d2a26675f7d8b (diff)
downloadqtwayland-82f01cc931ef5ed0a77f389666c8071c5c0c4b59.tar.gz
Remove autogenerated .qrc file in compositor import
This code would unconditionally generate a qrc file for two .qml files instead of just adding the qrc file to the repository for some reason. This caused problems in the conversion to cmake. Change-Id: Ib859e51155847f72d646ce174259d3b8ba5ca93d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index b337d343..a1cf2f9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,6 @@ 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