From 32cba5a6d7332c851d0339d6fdd05fd18978b97d Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Thu, 10 Jan 2013 20:16:36 +0400 Subject: [PATCH 1/2] Add wild-card suffix for Makefile With "CONFIG=debug_and_release" qmake generates both Makefile.Debug and Makefile.Release. And I assume it is useful to have all types Makefiles ignored. Signed-off-by: Alexey Brodkin --- Qt.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Qt.gitignore b/Qt.gitignore index 16b4ee58..79f807d9 100644 --- a/Qt.gitignore +++ b/Qt.gitignore @@ -16,5 +16,5 @@ *.pro.user.* moc_*.cpp qrc_*.cpp -Makefile +Makefile* *-build-* From f1d654c1b5135aef2339c1533eeaa32d618aa0a0 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Thu, 10 Jan 2013 20:18:50 +0400 Subject: [PATCH 2/2] Add "ui_*.h" pattern to block auto-generated headers moc automatically generates "ui_*.h" files for each *.ui file. Since they are auto-generated I assume they should be ignored. Signed-off-by: Alexey Brodkin --- Qt.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Qt.gitignore b/Qt.gitignore index 79f807d9..fd2c573c 100644 --- a/Qt.gitignore +++ b/Qt.gitignore @@ -16,5 +16,6 @@ *.pro.user.* moc_*.cpp qrc_*.cpp +ui_*.h Makefile* *-build-*