GitIgnore updates

* ANGLE artifacts * qfeatures Change-Id: I3cb8f78bf02119233f115ec53d536c05dd9776e7 Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Oswald Buddenhagen <[email protected]>
boris-fx · Dec 9, 2013 · 6d8b84e · 6d8b84e
1 parent e6799c6
commit 6d8b84e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -63,7 +63,7 @@ Makefile*
 *.gcov
 *.gcda
 *.gcno
-bin/Qt*.dll
+bin/*.dll
 bin/assistant*
 bin/designer*
 bin/dumpcpp*
@@ -112,13 +112,15 @@ mkspecs/default
 mkspecs/default-host
 mkspecs/qconfig.pri
 mkspecs/qdevice.pri
+mkspecs/qfeatures.pri
 moc_*.cpp
 qmake/qmake.exe
 qmake/Makefile.bak
 qmake/qmake_pch.pch
 src/corelib/global/qconfig.cpp
 src/corelib/global/qconfig.h
 src/corelib/global/qconfig.h.qmake
+src/corelib/global/qfeatures.h
 src/platformsupport/*_interface.*
 src/platformsupport/*_adaptor.*
 ui_*.h
@@ -183,6 +185,7 @@ src/3rdparty/webkit/includes2.txt
 # generated files in configure.exe bootstrapping
 tools/configure/configure.intermediate.manifest
 tools/configure/configure_pch.pch
+/configure.exe
 
 # Symlinks generated by configure
 tools/qvfb/qvfbhdr.h

diff --git a/src/angle/src/.gitignore b/src/angle/src/.gitignore
@@ -0,0 +1,6 @@
+/libGLESv2/renderer/
+/compiler/glslang_lex.cpp
+/compiler/glslang_tab.cpp
+/compiler/glslang_tab.h
+/compiler/preprocessor/ExpressionParser.cpp
+/compiler/preprocessor/Tokenizer.cpp