diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
| commit | f7837e28b5f83d116fa43d0401b7188ce27fc346 (patch) | |
| tree | 3de2560e4259f22224f334be17618386860decc7 /src/tools/qdoc/doc/config/qdoc.qdocconf | |
| parent | 8b0624182bd4998d32c23eded5dbe6dccfd26d5b (diff) | |
| parent | 44a58de2aea6d2ac71efe7261a398effbf139f3f (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/concurrent/qtconcurrentmedian.h
src/corelib/itemmodels/qabstractitemmodel.cpp
Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
Diffstat (limited to 'src/tools/qdoc/doc/config/qdoc.qdocconf')
| -rw-r--r-- | src/tools/qdoc/doc/config/qdoc.qdocconf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/qdoc/doc/config/qdoc.qdocconf b/src/tools/qdoc/doc/config/qdoc.qdocconf index a6ae18a675..992cec65dc 100644 --- a/src/tools/qdoc/doc/config/qdoc.qdocconf +++ b/src/tools/qdoc/doc/config/qdoc.qdocconf @@ -8,16 +8,16 @@ version = $QT_VERSION sourcedirs = .. exampledirs = .. \ - ../examples \ - ../../../../examples \ - config + ../examples -imagedirs = ../../../doc/src/templates/images \ - ../images \ - ../../../../widgets/doc/images \ +imagedirs = ../images \ + ../../../../widgets/doc/images +# ../../../doc/src/templates/images tagfile = ../html/qdoc.tags +examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css *.qdoc *.qdocinc *.sample" + qhp.projects = QDoc qhp.QDoc.file = qdoc.qhp |