diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-12-05 10:36:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-09 17:28:18 +0100 |
| commit | 6d8b84e8d574ea583d54b3de5cb3d275c41f2caf (patch) | |
| tree | ddb39233b06f8e4970fdd42fa2b94a0376adcd31 | |
| parent | e6799c6e336ef1e79ce4ade33db336f67b7f588b (diff) | |
GitIgnore updates
* ANGLE artifacts
* qfeatures
Change-Id: I3cb8f78bf02119233f115ec53d536c05dd9776e7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | src/angle/src/.gitignore | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index cc6102b64e..d7d38f265b 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,7 @@ Makefile* *.gcov *.gcda *.gcno -bin/Qt*.dll +bin/*.dll bin/assistant* bin/designer* bin/dumpcpp* @@ -112,6 +112,7 @@ mkspecs/default mkspecs/default-host mkspecs/qconfig.pri mkspecs/qdevice.pri +mkspecs/qfeatures.pri moc_*.cpp qmake/qmake.exe qmake/Makefile.bak @@ -119,6 +120,7 @@ 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 new file mode 100644 index 0000000000..9cbadb59ef --- /dev/null +++ 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 |