diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-12-06 16:16:26 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-03-10 14:57:27 +0000 |
| commit | 28f803d359c5f3102514d7817478cb4927114102 (patch) | |
| tree | a29a8c180f0405c0bbf9acd2ac46077cde9a3aed | |
| parent | 24c698643cf9101d74a7a0ffff660097c852cf9a (diff) | |
Make the documentation embeddable in other projects
This is for the qbs build. We've already done it for qmake.
Task-number: QTCREATORBUG-13124
Change-Id: I14ffd9d5184cef8378da377190107ff4496a815a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | doc/doc.qbs | 10 | ||||
| -rw-r--r-- | qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/doc/doc.qbs b/doc/doc.qbs index f7efdd239..c83259c42 100644 --- a/doc/doc.qbs +++ b/doc/doc.qbs @@ -6,6 +6,7 @@ Product { builtByDefault: false type: "qch" Depends { name: "Qt.core" } + Depends { name: "qbsbuildconfig" } files: [ "qbs.qdoc", @@ -28,8 +29,13 @@ Product { Group { fileTagsFilter: ["qdoc-output"] - qbs.install: true - qbs.installDir: "share/doc/qbs/html" + qbs.install: qbsbuildconfig.installHtml + qbs.installDir: qbsbuildconfig.docInstallDir qbs.installSourceBase: Qt.core.qdocOutputDir } + Group { + fileTagsFilter: ["qch"] + qbs.install: qbsbuildconfig.installQch + qbs.installDir: qbsbuildconfig.docInstallDir + } } diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs index 001882b1f..24b655398 100644 --- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -10,6 +10,9 @@ Module { property string libInstallDir: qbs.targetOS.contains("windows") ? "bin" : libDirName property string importLibInstallDir: libDirName property string libexecInstallDir: "libexec/qbs" + property bool installHtml: true + property bool installQch: false + property string docInstallDir: "share/doc/qbs/html" property string relativeLibexecPath: "../" + libexecInstallDir property string relativePluginsPath: "../" + libDirName property string relativeSearchPath: ".." |