summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-09-14 12:09:39 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-09-14 12:09:39 +0200
commita6ca9472de6d4cbdb85dfceaa4f8c10b243cea07 (patch)
tree719e2c3a1732ab0cc82c32d560484b5740f40a05 /.gitignore
parent658b0f610a71fab8c103b913d2cfd11c3c7c6bef (diff)
parentb3619f32c20b5851ada0826ec2e7ddc2ec8a210b (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts: src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p_p.h Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index d1ebf45c..7c99c1e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
/include
/lib
/mkspecs
+/doc
/examples/quickcontrols2/chattutorial/chapter1-settingup/chapter1-settingup
/examples/quickcontrols2/chattutorial/chapter2-lists/chapter2-lists