summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-06-17 11:06:31 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-18 08:12:19 +0200
commit321c27b5343c8359a4b6da57796502a8795358ff (patch)
treebda2b74cfc7e39ab588a9267db423a7dad8e86af /.gitignore
parent0ac216d949ea107f7fabe995ff4736628cc7d305 (diff)
downloadqtlocation-321c27b5343c8359a4b6da57796502a8795358ff.tar.gz
Update .gitignore
Change-Id: If85522504242dff45a681c3fece3b3c8a03de61f Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@jollamobile.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore114
1 files changed, 8 insertions, 106 deletions
diff --git a/.gitignore b/.gitignore
index c29326ae..77c16d66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ pcviewer.cfg
*.mode1v3
*_pch.h.cpp
*_resource.rc
+*.autosave
.#*
*.*#
core
@@ -40,69 +41,26 @@ Makefile*
*.qmlproject.user
*.gcov
bin/Qt*.dll
-bin/assistant*
-bin/designer*
-bin/dumpcpp*
-bin/idc*
-bin/linguist*
-bin/lrelease*
-bin/lupdate*
-bin/lconvert*
-bin/moc*
-bin/makeqpf*
-bin/pixeltool*
-bin/qmake*
-bin/qdoc3*
-bin/qt3to4*
-bin/qtdemo*
-bin/qttracereplay*
-bin/rcc*
-bin/uic*
-bin/patternist*
-bin/phonon*
-bin/qcollectiongenerator*
-bin/qdbus*
-bin/qhelpconverter*
-bin/qhelpgenerator*
-bin/qtconfig*
-bin/xmlpatterns*
-bin/cetest*
-bin/collectiongenerator
-bin/helpconverter
-bin/helpgenerator
-bin/kmap2qmap*
-bin/qlalr*
-bin/qmlconv*
-bin/qmldebugger*
-bin/qml*
-bin/qttracereplay*
configure.cache
config.status
+config.log
mkspecs/default
mkspecs/qconfig.pri
moc_*.cpp
-qmake/qmake.exe
-qmake/Makefile.bak
src/corelib/global/qconfig.cpp
src/corelib/global/qconfig.h
src/corelib/global/qconfig.h.qmake
ui_*.h
-tests/auto/qprocess/test*/*.exe
-tests/auto/qtcpsocket/stressTest/*.exe
-tests/auto/qprocess/fileWriterProcess/*.exe
-tests/auto/qmake/testdata/quotedfilenames/*.exe
-tests/auto/compilerwarnings/*.exe
-tests/auto/qmake/testdata/quotedfilenames/test.cpp
-tests/auto/qprocess/fileWriterProcess.txt
-.com.apple.timemachine.supported
-tests/auto/qlibrary/libmylib.so*
-tests/auto/qresourceengine/runtime_resource.rcc
-tools/activeqt/testcon/testcon.tlb
translations/*.qm
translations/*_untranslated.ts
qrc_*.cpp
-src/location/qtlocationversion.h
+doc/src/snippets/cpp/cppsnippet
+doc/src/snippets/places/placescppsnippet
+examples/declarative/places_list/places_list
+examples/declarative/places_map/places_map
+examples/logfilepositionsource/logfilepositionsource
+examples/weatherinfo/weatherinfo
# Test generated files
QObject.log
@@ -136,39 +94,12 @@ tst_*~
*.Debug
*.Release
-# WebKit temp files
-src/3rdparty/webkit/WebCore/mocinclude.tmp
-src/3rdparty/webkit/includes.txt
-src/3rdparty/webkit/includes2.txt
# Symlinks generated by configure
-tools/qvfb/qvfbhdr.h
-tools/qvfb/qlock_p.h
-tools/qvfb/qlock.cpp
-tools/qvfb/qwssignalhandler.cpp
-tools/qvfb/qwssignalhandler_p.h
.DS_Store
.pch
.rcc
*.app
-config.status
-config.tests/unix/cups/cups
-config.tests/unix/getaddrinfo/getaddrinfo
-config.tests/unix/getifaddrs/getifaddrs
-config.tests/unix/iconv/iconv
-config.tests/unix/ipv6/ipv6
-config.tests/unix/ipv6ifname/ipv6ifname
-config.tests/unix/largefile/largefile
-config.tests/unix/nis/nis
-config.tests/unix/odbc/odbc
-config.tests/unix/openssl/openssl
-config.tests/unix/stl/stl
-config.tests/unix/zlib/zlib
-config.tests/unix/3dnow/3dnow
-config.tests/unix/mmx/mmx
-config.tests/unix/sse/sse
-config.tests/unix/sse2/sse2
-
# Directories to ignore
@@ -193,35 +124,6 @@ doc-build
.pch
.metadata
-# Symbian build system generated files
-# ---------------------
-
-ABLD.BAT
-bld.inf*
-*.mmp
-*.mk
-*.rss
-*.loc
-!s60main.rss
-*.pkg
-plugin_commonu.def
-*.qtplugin
-*.sis
-*.sisx
-*.lst
-*.exe
-*.mif
-*.rsc
-*.sym
-*.lib
-
-# runonphone crash dumps
-d_exc_*.txt
-d_exc_*.stk
-
-# Generated by abldfast.bat from devtools.
-.abldsteps.*
-
# Carbide project files
# ---------------------
.project