summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2015-01-11 21:38:52 (GMT)
committerOrgad Shaneh <orgads@gmail.com>2015-01-12 12:27:57 (GMT)
commit124c10da48e918f80873c31c6f81252cce9b7261 (patch)
tree41c238d42f7fee0b078e0f901099d1ff2078901d
parente2b8bf178f9cc873f47ec8c708f6712acdae45a7 (diff)
downloadQt-124c10da48e918f80873c31c6f81252cce9b7261.zip
Qt-124c10da48e918f80873c31c6f81252cce9b7261.tar.gz
Qt-124c10da48e918f80873c31c6f81252cce9b7261.tar.bz2
Update GitIgnore
Add webkit artifacts Change-Id: Ifeb9f0fdf4651183400719f46257dd430b57b362 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7a872c1..e43abfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,7 +94,9 @@ bin/qttracereplay*
configure.cache
config.status
mkspecs/default
+mkspecs/modules/qt_webkit_version.pri
mkspecs/qconfig.pri
+mkspecs/qdevice.pri
moc_*.cpp
qmake/qmake.exe
qmake/Makefile.bak
@@ -119,6 +121,7 @@ tools/activeqt/testcon/testcon.tlb
translations/*.qm
translations/*_untranslated.ts
qrc_*.cpp
+/.device.vars
# Test generated files
QObject.log
@@ -156,6 +159,8 @@ tst_*~
src/3rdparty/webkit/WebCore/mocinclude.tmp
src/3rdparty/webkit/includes.txt
src/3rdparty/webkit/includes2.txt
+src/3rdparty/webkit/Source/WebKit/qt/tests/MIMESniffing/MIMESniffing
+src/3rdparty/webkit/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap
# Symlinks generated by configure
tools/qvfb/qvfbhdr.h