summaryrefslogtreecommitdiffstats
path: root/doc/global/fileextensions.qdocconf
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-10-02 15:04:15 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-10-02 17:24:58 +0000
commit925d6eff3e8e5bc801210a67ec4cf1d4b3492fc2 (patch)
treea03f381e4823e29b2e50c1a80588f06e450656fc /doc/global/fileextensions.qdocconf
parenta3292031295a09e5e959141db78c2310e08562ae (diff)
parentd0eaa737e10aed34c09ba753e21c3e027b5ce58c (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'doc/global/fileextensions.qdocconf')
-rw-r--r--doc/global/fileextensions.qdocconf2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/global/fileextensions.qdocconf b/doc/global/fileextensions.qdocconf
index 88e51595f1..ca036619f1 100644
--- a/doc/global/fileextensions.qdocconf
+++ b/doc/global/fileextensions.qdocconf
@@ -2,7 +2,7 @@ naturallanguage = en
outputencoding = UTF-8
sourceencoding = UTF-8
-examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css *.glsl"
examples.imageextensions = "*.png *.jpg *.gif"
headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx"