diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-05-07 00:31:52 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-08-05 20:32:01 +0000 |
| commit | 41498e121cd89e9614cde3497e8ed8de3906148a (patch) | |
| tree | f413c2eddebd252a1e9e5cebc1a327dd09d82d88 /doc | |
| parent | a455d5349b3ad2b947eec89545d36a7ee367d1eb (diff) | |
Use BlackboxOutputArtifactTracker for qdoc.
Change-Id: Ie5b2eb70cd371287820dcc180ff3e21682ae062f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.qbs | 6 | ||||
| -rw-r--r-- | doc/reference/modules/qt-modules.qdoc | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/doc/doc.qbs b/doc/doc.qbs index 9155bb6d5..f7efdd239 100644 --- a/doc/doc.qbs +++ b/doc/doc.qbs @@ -19,7 +19,6 @@ Product { } property string versionTag: QbsFunctions.qbsVersion().replace(/\.|-/g, "") - Qt.core.qdocQhpFileName: "qbs.qhp" Qt.core.qdocEnvironment: [ "QBS_VERSION=" + QbsFunctions.qbsVersion(), "SRCDIR=" + path, @@ -28,8 +27,9 @@ Product { ] Group { - fileTagsFilter: "qdoc-html" + fileTagsFilter: ["qdoc-output"] qbs.install: true - qbs.installDir: "share/doc/qbs" + qbs.installDir: "share/doc/qbs/html" + qbs.installSourceBase: Qt.core.qdocOutputDir } } diff --git a/doc/reference/modules/qt-modules.qdoc b/doc/reference/modules/qt-modules.qdoc index 9512be27a..1e8742c0d 100644 --- a/doc/reference/modules/qt-modules.qdoc +++ b/doc/reference/modules/qt-modules.qdoc @@ -274,11 +274,6 @@ \li \c{"qdoc3"} for Qt 4, \c{"qdoc"} otherwise \li The base name of the \c qdoc tool. \row - \li qdocQhpFileName - \li \c{string} - \li \c{undefined} - \li Controls which name the \c qhp file gets when generating documentation with \c qdoc. - \row \li qtBuildVariant \li \c{string} \li See below. |