summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2013-12-02 18:19:27 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-03 11:57:06 +0100
commit7f980badcf1ec600f6a0a8f205a284240c501a64 (patch)
tree4b4d746be52a93f050af9cd28a00b0d157d313b4
parent164f3839cc24d14590e11f898a39d4b05b90ce51 (diff)
More gitignore patterns
Also whitelist core.gyp in prevision for a handwritten one. Change-Id: I8122d71893158e745f1368fc1b9d0d7aab3d220b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 9570dacd1..4710f2b3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
*.o
Makefile
+Makefile.*
out/
-src/core/core.gyp
+src/core/core_generated.gyp
*.pro.user*
.qmake.cache
*.moc
@@ -19,3 +20,4 @@ tests/widgets/qwebenginehistory/tst_qwebenginehistory
tests/widgets/qwebengineinspector/tst_qwebengineinspector
tests/widgets/qwebenginepage/tst_qwebenginepage
tests/widgets/qwebengineview/tst_qwebengineview
+tools/**/*.pyc