summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorNobuaki Sukegawa <nsukeg@gmail.com>2014-12-15 02:57:45 +0900
committerNobuaki Sukegawa <nsukeg@gmail.com>2014-12-20 20:24:25 +0100
commitee771dda2e9e304edea88e6d5f6e6d540a0bab97 (patch)
tree0efa6a7112430bdef50c4837681b44a6608035c2 /.gitignore
parenteff84a13afaf3e3ab1f3ef28d28e5d20b0145891 (diff)
Add files generated by tests to gitignore
Change-Id: I1fac4df1e00cbe37c0c9ea69562dffc1eb4d5111 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore14
1 files changed, 11 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index b0854aab2a..e949cddb22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,8 +78,6 @@ bin/qml*
bin/qttracereplay*
configure.cache
config.status
-mkspecs/default
-mkspecs/qconfig.pri
moc_*.cpp
qmake/qmake.exe
qmake/Makefile.bak
@@ -87,6 +85,11 @@ src/corelib/global/qconfig.cpp
src/corelib/global/qconfig.h
src/corelib/global/qconfig.h.qmake
ui_*.h
+tests/auto/cmake/build
+tests/auto/installed_cmake/build
+tests/auto/qml/qqmlapplicationengine/testapp/testapp
+tests/auto/qml/temp.qml
+tests/auto/qmltest/*.png
tests/auto/qprocess/test*/*.exe
tests/auto/qtcpsocket/stressTest/*.exe
tests/auto/qprocess/fileWriterProcess/*.exe
@@ -178,6 +181,7 @@ config.tests/unix/sse2/sse2
# Directories to ignore
# ---------------------
+mkspecs/*
debug
imports/*
examples/tools/plugandpaint/plugins
@@ -252,17 +256,21 @@ src/xml/lib/
*.map
work
-#generated version headers
+# Generated version headers
src/qmltest/qtquicktestversion.h
src/qtquick1/qtquick1version.h
src/qmldevtools/qtqmldevtoolsversion.h
src/quick/qtquickversion.h
src/qml/qtqmlversion.h
+# Discard !tst_*.*
+tests/auto/headersclean/tst_headersclean.cpp
tests/auto/*/*.o
tests/auto/*/*.moc
tests/auto/*/*/*.o
tests/auto/*/*/*.moc
+tests/auto/*/*/*/*.o
+tests/auto/*/*/*/*.moc
# Generated static plugin import sources
*_plugin_import.cpp