summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-11-30 14:24:59 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-11-30 17:21:09 (GMT)
commit7380e973a5e8dd8633e955792f219f6231b9513e (patch)
tree2c1746065f5c9d6947dd69a1ea63dfe29d1c9a32
parent173e6954e13871606a685229af279a2038f9d939 (diff)
downloadQt-7380e973a5e8dd8633e955792f219f6231b9513e.zip
Qt-7380e973a5e8dd8633e955792f219f6231b9513e.tar.gz
Qt-7380e973a5e8dd8633e955792f219f6231b9513e.tar.bz2
Add test generated files to .gitignore
The tests/.gitignore, did not inherit from the main one, which causes git to show hundreds of new files when running tests on symbian. Reviewed-by: Markus Goetz
-rw-r--r--.gitignore14
-rw-r--r--tests/.gitignore6
2 files changed, 13 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index af52197..521cea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,6 +119,14 @@ translations/*.qm
translations/*_untranslated.ts
qrc_*.cpp
+# Test generated files
+QObject.log
+tst_*
+!tst_*.*
+tst_*.log
+tst_*.debug
+tst_*~
+
# xemacs temporary files
*.flc
@@ -203,7 +211,7 @@ doc-build
# ---------------------
ABLD.BAT
-bld.inf
+bld.inf*
*.mmp
*.mk
*.rss
@@ -221,6 +229,10 @@ plugin_commonu.def
*.sym
*.lib
+# runonphone crash dumps
+d_exc_*.txt
+d_exc_*.stk
+
# Generated by abldfast.bat from devtools.
.abldsteps.*
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index b203473..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-QObject.log
-tst_*
-!tst_*.*
-tst_*.log
-tst_*.debug
-tst_*~