summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-05-18 03:23:46 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-05-18 03:23:46 (GMT)
commit92b783a4ab9687baaf55d732965fe21aa69146a4 (patch)
tree30165ea503df938eb2d4b21cee1d8ad19116f3b4
parent0b8ae4978c460e75e5c96937ada2341fceac2ee2 (diff)
downloadQt-92b783a4ab9687baaf55d732965fe21aa69146a4.zip
Qt-92b783a4ab9687baaf55d732965fe21aa69146a4.tar.gz
Qt-92b783a4ab9687baaf55d732965fe21aa69146a4.tar.bz2
git ignore stuff
-rw-r--r--.gitignore1
-rw-r--r--tests/.gitignore (renamed from tests/auto/declarative/.gitignore)1
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5707371..fd7b495 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@ bin/lrelease*
bin/lupdate*
bin/lconvert*
bin/moc*
+bin/makeqpf*
bin/pixeltool*
bin/qmake*
bin/qdoc3*
diff --git a/tests/auto/declarative/.gitignore b/tests/.gitignore
index 57608cf..b203473 100644
--- a/tests/auto/declarative/.gitignore
+++ b/tests/.gitignore
@@ -1,3 +1,4 @@
+QObject.log
tst_*
!tst_*.*
tst_*.log