From 2530d46c5a8a9dfba6e02b48a376545cdaf7a361 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 6 Nov 2017 22:22:42 -0800 Subject: Allow disabling pieces of the Qbs project by category This allows the "resources build" to not rely on a valid Qt profile. Task-number: QBS-1238 Change-Id: I1c743a95993099250da714c794b6e0ac16133609 Reviewed-by: Christian Kandeler --- doc/doc.qbs | 92 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 48 insertions(+), 44 deletions(-) (limited to 'doc/doc.qbs') diff --git a/doc/doc.qbs b/doc/doc.qbs index 61e205f57..6d02d1cca 100644 --- a/doc/doc.qbs +++ b/doc/doc.qbs @@ -1,51 +1,55 @@ import qbs 1.0 -Product { - name: "qbs documentation" - builtByDefault: false - type: "qch" - Depends { name: "Qt.core" } - Depends { name: "qbsbuildconfig" } - Depends { name: "qbsversion" } +Project { + references: ["man/man.qbs"] - files: [ - "../README", - "classic.css", - "external-resources.qdoc", - "fixnavi.pl", - "howtos.qdoc", - "qbs.qdoc", - "qbs-online.qdocconf", - "config/*.qdocconf", - "config/style/qt5-sidebar.html", - "reference/**/*", - "templates/**/*", - "images/**", - "targets/**", - ] - Group { - name: "main qdocconf file" - files: "qbs.qdocconf" - fileTags: "qdocconf-main" - } + Product { + name: "qbs documentation" + builtByDefault: false + type: "qch" + Depends { name: "Qt.core" } + Depends { name: "qbsbuildconfig" } + Depends { name: "qbsversion" } - property string versionTag: qbsversion.version.replace(/\.|-/g, "") - Qt.core.qdocEnvironment: [ - "QBS_VERSION=" + qbsversion.version, - "SRCDIR=" + path, - "QT_INSTALL_DOCS=" + Qt.core.docPath, - "QBS_VERSION_TAG=" + versionTag - ] + files: [ + "../README", + "classic.css", + "external-resources.qdoc", + "fixnavi.pl", + "howtos.qdoc", + "qbs.qdoc", + "qbs-online.qdocconf", + "config/*.qdocconf", + "config/style/qt5-sidebar.html", + "reference/**/*", + "templates/**/*", + "images/**", + "targets/**", + ] + Group { + name: "main qdocconf file" + files: "qbs.qdocconf" + fileTags: "qdocconf-main" + } - Group { - fileTagsFilter: ["qdoc-output"] - qbs.install: qbsbuildconfig.installHtml - qbs.installDir: qbsbuildconfig.docInstallDir - qbs.installSourceBase: Qt.core.qdocOutputDir - } - Group { - fileTagsFilter: ["qch"] - qbs.install: qbsbuildconfig.installQch - qbs.installDir: qbsbuildconfig.docInstallDir + property string versionTag: qbsversion.version.replace(/\.|-/g, "") + Qt.core.qdocEnvironment: [ + "QBS_VERSION=" + qbsversion.version, + "SRCDIR=" + path, + "QT_INSTALL_DOCS=" + Qt.core.docPath, + "QBS_VERSION_TAG=" + versionTag + ] + + Group { + fileTagsFilter: ["qdoc-output"] + qbs.install: qbsbuildconfig.installHtml + qbs.installDir: qbsbuildconfig.docInstallDir + qbs.installSourceBase: Qt.core.qdocOutputDir + } + Group { + fileTagsFilter: ["qch"] + qbs.install: qbsbuildconfig.installQch + qbs.installDir: qbsbuildconfig.docInstallDir + } } } -- cgit v1.2.3