Update and clean .gitignore

* Prepend / for directories expected to be in the root directory
* Append / (and remove trailing *) for entries which are expected
  to be directories
* Add some qmake-generated directories (.obj, .moc, .uic)
* Include all exe files in a single rule
* Add cpaster, sdktool and qtcreator_crash_handler
* Add all tests binaries

Change-Id: Ic8640cfe2222bc18a16bf18f96ba6733cf50eaa8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

1 files changed, 118 insertions, 88 deletions

diff --git a/.gitignore b/.gitignore
index 1e02efd951..c919064366 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *.orig
 *.rej
 *.so
+*.so.*
 *_pch.h.cpp
 *_resource.rc
 *.qm
@@ -37,10 +38,10 @@ Thumbs.db
 *.qmlproject.user*
 *.pluginspec
 *.json
-src/app/Info.plist
+/src/app/Info.plist
 app_version.h
-src/plugins/coreplugin/ide_version.h
-share/qtcreator/externaltools
+/src/plugins/coreplugin/ide_version.h
+/share/qtcreator/externaltools
 phony.c
 
 # xemacs temporary files
@@ -72,99 +73,128 @@ phony.c
 *.pyc
 
 # translation related:
-share/qtcreator/translations/*_tr.h
-share/qtcreator/translations/qtcreator_untranslated.ts
+/share/qtcreator/translations/*_tr.h
+/share/qtcreator/translations/qtcreator_untranslated.ts
 
 # Directories to ignore
 # ---------------------
 
-build
-debug
-lib/*
-lib64/*
-release
-doc/html/*
-doc/html-dev/*
-doc/api/html/*
-doc/pluginhowto/html/*
-dist/gdb/python
-.rcc
-.pch
-dist/gdb/qtcreator-*
-dist/gdb/source
-dist/gdb/staging
-ipch
-tmp
-/*-debug
-/*-release
+debug/
+release/
+/lib/
+/lib64/
+/*-debug/
+/*-release/
+/doc/html/
+/doc/html-dev/
+/doc/api/html/
+/doc/pluginhowto/html/
+/dist/gdb/python/
+.moc/
+.obj/
+.pch/
+.rcc/
+.uic/
+/dist/gdb/qtcreator-*/
+/dist/gdb/source/
+/dist/gdb/staging/
+ipch/
+tmp/
 # ignore both a directory as well as a symlink
-share/qtcreator/QtProject/
-share/qtcreator/QtProject
+/share/qtcreator/QtProject
 
 # Binaries
 # --------
-bin/*.dll
-bin/qtcreator
-bin/qtcreator_process_stub*
-bin/qtcreator_ctrlc_stub*
-bin/qtcreator.exe
-bin/qmlpuppet
-bin/qmlpuppet.exe
-bin/qml2puppet
-bin/qml2puppet.exe
-bin/qtpromaker
-bin/qtpromaker.exe
-share/doc/qtcreator/*.qch
-src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor
-src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.exe
-src/tools/cplusplus-update-frontend/cplusplus-update-frontend
-src/tools/cplusplus-update-frontend/cplusplus-update-frontend.exe
-src/tools/qml/qmldump/qmldump
-src/tools/examplesscanner/examplesscanner
-src/tools/valgrindfake/valgrind-fake
-bin/*.exe
+*.dll
+*.exe
+/bin/cpaster
+/bin/qmlpuppet
+/bin/qml2puppet
+/bin/qtcreator
+/bin/qtcreator_crash_handler
+/bin/qtcreator_ctrlc_stub
+/bin/qtcreator_process_stub
+/bin/qtpromaker
+/bin/sdktool
+/share/doc/qtcreator/*.qch
+/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor
+/src/tools/cplusplus-update-frontend/cplusplus-update-frontend
+/src/tools/qml/qmldump/qmldump
+/src/tools/examplesscanner/examplesscanner
+/src/tools/valgrindfake/valgrind-fake
 
 # Tests
 #------
-tests/manual/cplusplus-frontend/cplusplus-frontend
-tests/manual/cplusplus-frontend/cplusplus-frontend.exe
-tests/manual/qml-ast2dot/qml-ast2dot
-tests/manual/debugger/simple/libsimple_test_plugin.*dylib
-tests/manual/debugger/simple/simple_test_app
-tests/manual/plain-cplusplus/plain-c++
-tests/manual/preprocessor/pp
-tests/tools/cplusplus-ast2png/cplusplus-ast2png
-tests/tools/cplusplus-ast2png/cplusplus-ast2png.exe
-tests/auto/cplusplus/codegen/tst_codegen
-tests/auto/cplusplus/cxx11/tst_cxx11
-tests/auto/cplusplus/misc/tst_misc
-tests/auto/cplusplus/simplifytypes/tst_simplifytypes
-tests/auto/cplusplus/ast/tst_ast
-tests/auto/cplusplus/codeformatter/tst_codeformatter
-tests/auto/cplusplus/findusages/tst_findusages
-tests/auto/cplusplus/lookup/tst_lookup
-tests/auto/cplusplus/preprocessor/tst_preprocessor
-tests/auto/cplusplus/semantic/tst_semantic
-tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter
-tests/auto/qml/qmldesigner/bauhaustests/tst_bauhaus
-tests/auto/qml/qmldesigner/coretests/tst_qmldesigner_core
-tests/auto/qml/qmldesigner/propertyeditortests/tst_propertyeditor
-tests/auto/profilewriter/tst_profilewriter
-tests/auto/externaltool/tst_externaltool
-tests/valgrind/memcheck/modeldemo
-tests/valgrind/memcheck/parsertests
-tests/valgrind/memcheck/testapps/free1/free1
-tests/valgrind/memcheck/testapps/free2/free2
-tests/valgrind/memcheck/testapps/invalidjump/invalidjump
-tests/valgrind/memcheck/testapps/leak1/leak1
-tests/valgrind/memcheck/testapps/leak2/leak2
-tests/valgrind/memcheck/testapps/leak3/leak3
-tests/valgrind/memcheck/testapps/leak4/leak4
-tests/valgrind/memcheck/testapps/overlap/overlap
-tests/valgrind/memcheck/testapps/syscall/syscall
-tests/valgrind/memcheck/testapps/uninit1/uninit1
-tests/valgrind/memcheck/testapps/uninit2/uninit2
-tests/valgrind/memcheck/testapps/uninit3/uninit3
-tests/valgrind/memcheck/testrunner
-tests/valgrind/callgrind/callgrindparsertests
-tests/valgrind/callgrind/modeltest
+/tests/manual/cplusplus-frontend/cplusplus-frontend
+/tests/manual/qml-ast2dot/qml-ast2dot
+/tests/manual/debugger/simple/libsimple_test_plugin.*dylib
+/tests/manual/debugger/simple/simple_test_app
+/tests/manual/plain-cplusplus/plain-c++
+/tests/manual/preprocessor/pp
+/tests/tools/cplusplus-ast2png/cplusplus-ast2png
+/tests/auto/aggregation/tst_aggregation
+/tests/auto/changeset/tst_changeset
+/tests/auto/cplusplus/checksymbols/tst_checksymbols
+/tests/auto/cplusplus/codegen/tst_codegen
+/tests/auto/cplusplus/cxx11/tst_cxx11
+/tests/auto/cplusplus/misc/tst_misc
+/tests/auto/cplusplus/simplifytypes/tst_simplifytypes
+/tests/auto/cplusplus/ast/tst_ast
+/tests/auto/cplusplus/codeformatter/tst_codeformatter
+/tests/auto/cplusplus/findusages/tst_findusages
+/tests/auto/cplusplus/lookup/tst_lookup
+/tests/auto/cplusplus/preprocessor/tst_preprocessor
+/tests/auto/cplusplus/semantic/tst_semantic
+/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter
+/tests/auto/debugger/tst_dumpers
+/tests/auto/debugger/tst_gdb
+/tests/auto/debugger/tst_namedemangler
+/tests/auto/debugger/tst_olddumpers
+/tests/auto/debugger/tst_version
+/tests/auto/environment/tst_environment
+/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager
+/tests/auto/extensionsystem/pluginspec/tst_pluginspec
+/tests/auto/externaltool/tst_externaltool
+/tests/auto/fakevim/tst_fakevim
+/tests/auto/filesearch/tst_filesearch
+/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine
+/tests/auto/generichighlighter/specificrules/tst_specificrules
+/tests/auto/ioutils/tst_ioutils
+/tests/auto/profilewriter/tst_profilewriter
+/tests/auto/qml/qmldesigner/bauhaustests/tst_bauhaus
+/tests/auto/qml/qmldesigner/coretests/tst_qmldesigner_core
+/tests/auto/qml/qmldesigner/propertyeditortests/tst_propertyeditor
+/tests/auto/qtcprocess/tst_qtcprocess
+/tests/auto/utils/fileutils/tst_fileutils
+/tests/auto/utils_stringutils/tst_utils_stringutils
+/tests/manual/debugger/gui/gui
+/tests/manual/debugger/helper/helper
+/tests/manual/fakevim/tst_fakevim
+/tests/manual/preprocessor/tst_pp
+/tests/manual/process/process
+/tests/manual/proparser/testreader
+/tests/manual/ssh/errorhandling/errorhandling
+/tests/manual/ssh/remoteprocess/remoteprocess
+/tests/manual/ssh/sftp/sftp
+/tests/manual/ssh/sftpfsmodel/sftpfsmodel
+/tests/manual/ssh/shell/shell
+/tests/manual/ssh/tunnel/tunnel
+/tests/manual/utils/tcpportsgatherer/tst_tcpportsgatherer
+/tests/tools/qml-ast2dot/qml-ast2dot
+/tests/valgrind/memcheck/modeldemo
+/tests/valgrind/memcheck/parsertests
+/tests/valgrind/memcheck/testapps/free1/free1
+/tests/valgrind/memcheck/testapps/free2/free2
+/tests/valgrind/memcheck/testapps/invalidjump/invalidjump
+/tests/valgrind/memcheck/testapps/leak1/leak1
+/tests/valgrind/memcheck/testapps/leak2/leak2
+/tests/valgrind/memcheck/testapps/leak3/leak3
+/tests/valgrind/memcheck/testapps/leak4/leak4
+/tests/valgrind/memcheck/testapps/overlap/overlap
+/tests/valgrind/memcheck/testapps/syscall/syscall
+/tests/valgrind/memcheck/testapps/uninit1/uninit1
+/tests/valgrind/memcheck/testapps/uninit2/uninit2
+/tests/valgrind/memcheck/testapps/uninit3/uninit3
+/tests/valgrind/memcheck/testrunner
+/tests/valgrind/callgrind/callgrindparsertests
+/tests/valgrind/callgrind/modeltest