Skip to content
GitLab
Commit 7a9b7172 authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot
Browse files

Merge remote-tracking branch 'origin/5.11' into dev 

Change-Id: I473cea60622b1515b450b1c80fb4236d9fff2479
parents 0a991262 4e10f354
dev 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 wip/cmake v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 deletions
src/imageformats/doc/qtimageformats.qdocconf
+ 3
− 0
View file @ 7a9b7172
...@@ -5,6 +5,9 @@ project = QtImageFormats ...@@ -5,6 +5,9 @@ project = QtImageFormats
description = Qt Image Formats Documentation description = Qt Image Formats Documentation
version = $QT_VERSION version = $QT_VERSION
# Instruct Clang to not look for a module header
moduleheader =
# Directories in which to search for files to document. # Directories in which to search for files to document.
# Paths are relative to the location of this file. # Paths are relative to the location of this file.
# exampledirs += ../examples # exampledirs += ../examples
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment