diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-12 09:59:55 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-12 09:59:55 +0200 |
| commit | c9b56717542749b271d5e48c7bf7698884e94f8f (patch) | |
| tree | 424aabcf1197798d2294cb05eb047d51c4f82bce /.gitignore | |
| parent | 6ab2f93f184470998e452cd709a881258dfef6a0 (diff) | |
| parent | 8e1169f4bf6fc97f7f864cefeb5a273f271798cf (diff) | |
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0-rc1
Change-Id: Iee9542b518367018b6e672ff920bfdb411639f8b
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index a16cefa843..1579006f2a 100644 --- a/.gitignore +++ b/.gitignore @@ -125,6 +125,7 @@ compile_commands.json /doc/html/qtcreator/ /doc/html/qtcreator-dev/ /doc/html/qtdesignstudio/ +/doc/qtdesignstudio/doc/html /lib/ /lib64/ /libexec/ |