diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-04-04 14:04:58 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-04-04 13:57:14 +0000 |
| commit | ead66987d4f0459281ee4ee59216448732c623a6 (patch) | |
| tree | 7ea35f341f990a468e3a372def7c02ae8a84b8da /qtcreator.pro | |
| parent | cfda627abc9f89f195d412d2e9e28679295b11cf (diff) | |
Update qbs submodule
To HEAD of 1.8 branch, and adapt to changes of qbs's doc_targets.pri
Change-Id: I8027b02bd88691ce6460836d9cc67279f442058b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index 460ecd3301..e25e8cc7f6 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -79,15 +79,16 @@ exists(src/shared/qbs/qbs.pro) { } # Create qbs documentation targets. - QBS_DOCS_BUILD_DIR=$$IDE_DOC_PATH - QBS_HTML_DOC_PATH=$$OUT_PWD/doc/html-qbs - QBS_DOCS_INSTALL_DIR=$$INSTALL_DOC_PATH - QDOC_BIN = $$QDOC - HELPGENERATOR = $$QHELPGENERATOR - include(src/shared/qbs/qbs_version.pri) + DOC_FILES = + DOC_TARGET_PREFIX = qbs_ + include(src/shared/qbs/doc/doc_shared.pri) include(src/shared/qbs/doc/doc_targets.pri) docs.depends += qbs_docs - install_docs.depends += install_inst_qbs_qch_docs + !build_online_docs { + install_docs.depends += install_qbs_docs + } + unset(DOC_FILES) + unset(DOC_TARGET_PREFIX) } contains(QT_ARCH, i386): ARCHITECTURE = x86 |