Commit ead66987 authored by Joerg Bornemann's avatar Joerg Bornemann

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's avatarChristian Kandeler <christian.kandeler@qt.io>
parent cfda627a
......@@ -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
......
Subproject commit 24000d556fefdb3dcd4103d3d1679429434e6f58
Subproject commit cc99f7de4e1578feb1ca8e5a2ca7384b25b6d427
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment