diff options
| author | Titta Heikkala <titta.heikkala@digia.com> | 2013-10-31 09:08:27 +0200 |
|---|---|---|
| committer | Titta Heikkala <titta.heikkala@digia.com> | 2013-11-01 07:12:12 +0200 |
| commit | 214b6c6d3a2b1746071db69125777e4e6c941c12 (patch) | |
| tree | 43c3fcdcb9593f9446d69e8b8f8c701b4b89a3d0 /doc | |
| parent | d95a3b0d6ff1e5f4bbe4886246f0a985bc15d539 (diff) | |
Fix documentation paths
The paths for qdocinc files and for images has been fixed so that
creating the documentation works also for Mac.
Task-number: QTRD-2492
Change-Id: Ibfefd06dfb4d85bbdb10b400aadda204ad50c21a
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/docconf/qcharts-qt4.qdocconf | 2 | ||||
| -rw-r--r-- | doc/docconf/qcharts-qt5.qdocconf | 10 | ||||
| -rw-r--r-- | doc/docconf/qcharts.qdocconf | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/doc/docconf/qcharts-qt4.qdocconf b/doc/docconf/qcharts-qt4.qdocconf index 6df07fdf..a819a0c4 100644 --- a/doc/docconf/qcharts-qt4.qdocconf +++ b/doc/docconf/qcharts-qt4.qdocconf @@ -4,6 +4,4 @@ include(qchart-html-template.qdocconf) include(qchart-qch.qdocconf) include(qcharts.qdocconf) -outputdir = ../html -imagedirs = ../images sourcedirs += ../src_qt4 diff --git a/doc/docconf/qcharts-qt5.qdocconf b/doc/docconf/qcharts-qt5.qdocconf index 5c1fe535..33c6836f 100644 --- a/doc/docconf/qcharts-qt5.qdocconf +++ b/doc/docconf/qcharts-qt5.qdocconf @@ -4,6 +4,12 @@ include(qchart-qch.qdocconf) include(qcharts.qdocconf) defines = QDOC_QT5 -outputdir = ../html -imagedirs = ../../images +sourcedirs += ../../ + +#excludedirs for Windows and Linux excludedirs += ../src_qt4 +#excludefiles for Mac +excludefiles += ../src_qt4/demos.qdoc \ + ../src_qt4/examples.qdoc \ + ../src_qt4/index.qdoc \ + ../src_qt4/qml.qdoc diff --git a/doc/docconf/qcharts.qdocconf b/doc/docconf/qcharts.qdocconf index 55185ce2..520301df 100644 --- a/doc/docconf/qcharts.qdocconf +++ b/doc/docconf/qcharts.qdocconf @@ -14,6 +14,9 @@ exampledirs = ../../ \ ../../src \ ../../examples +outputdir = ../html +imagedirs = ../images + sources.fileextensions = *.cpp *.qdoc *.mm *.qml *.qdocinc headers.fileextensions = *.h *.ch *.h++ *.hh *.hpp *.hxx examples.fileextensions = *.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml |