1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GitIgnore updates

Browse Source 
* ANGLE artifacts
* qfeatures

Change-Id: I3cb8f78bf02119233f115ec53d536c05dd9776e7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Orgad Shaneh 2013-12-05 10:36:00 +02:00 committed by The Qt Project
parent e6799c6e33
commit 6d8b84e8d5
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -63,7 +63,7 @@ Makefile*
*.gcov *.gcov
*.gcda *.gcda
*.gcno *.gcno
bin/Qt*.dll bin/*.dll
bin/assistant* bin/assistant*
bin/designer* bin/designer*
bin/dumpcpp* bin/dumpcpp*
@ -112,6 +112,7 @@ mkspecs/default
mkspecs/default-host mkspecs/default-host
mkspecs/qconfig.pri mkspecs/qconfig.pri
mkspecs/qdevice.pri mkspecs/qdevice.pri
mkspecs/qfeatures.pri
moc_*.cpp moc_*.cpp
qmake/qmake.exe qmake/qmake.exe
qmake/Makefile.bak qmake/Makefile.bak
@ -119,6 +120,7 @@ qmake/qmake_pch.pch
src/corelib/global/qconfig.cpp src/corelib/global/qconfig.cpp
src/corelib/global/qconfig.h src/corelib/global/qconfig.h
src/corelib/global/qconfig.h.qmake src/corelib/global/qconfig.h.qmake
src/corelib/global/qfeatures.h
src/platformsupport/*_interface.* src/platformsupport/*_interface.*
src/platformsupport/*_adaptor.* src/platformsupport/*_adaptor.*
ui_*.h ui_*.h
@ -183,6 +185,7 @@ src/3rdparty/webkit/includes2.txt
# generated files in configure.exe bootstrapping # generated files in configure.exe bootstrapping
tools/configure/configure.intermediate.manifest tools/configure/configure.intermediate.manifest
tools/configure/configure_pch.pch tools/configure/configure_pch.pch
/configure.exe
# Symlinks generated by configure # Symlinks generated by configure
tools/qvfb/qvfbhdr.h tools/qvfb/qvfbhdr.h

6
src/angle/src/.gitignore vendored Normal file
View File

@ -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