diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-31 11:43:22 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-02-07 18:19:51 +0000 |
| commit | 1c571e5fe7a31e7accb04b37a1d3bd7c8855d05c (patch) | |
| tree | 65241f1258136d0c45bcaa3b51e1393a2f595e6a /.gitignore | |
| parent | 2145cdc54d5812793310f7e3b3709bfa2648bd50 (diff) | |
| parent | 4e7af2061e8c323b2a21f0549643a2cfab191664 (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index e4079c6b4d..95a6964dd7 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,8 @@ qt*-config.h qt*-config_p.h qt*-config.pri +*.pyc +.mypy_cache /include/ @@ -56,11 +58,12 @@ qt*-config.pri /src/angle/src/QtANGLE/libANGLE/ /src/angle/src/libGLESv2/libANGLE/ -/examples/*/*/* -!/examples/*/*/*[.]* -!/examples/*/*/README -!/examples/*/doc/* -!/examples/*/doc/*/* +# FIXME: Ignore these again? +# /examples/*/*/* +# !/examples/*/*/*[.]* +# !/examples/*/*/README +# !/examples/*/doc/* +# !/examples/*/doc/*/* /translations/*.qm /translations/*_en.ts @@ -321,3 +324,6 @@ wrapper.bat # Generated by qt.prf *_plugin_import.cpp + +# Typical cmake build directories +/build* |