feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update qbs submodule

Browse Source 
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>
This commit is contained in:
Joerg Bornemann
2017-04-04 14:04:58 +02:00
parent cfda627abc
commit ead66987d4
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
qtcreator.pro
View File

@@ -79,15 +79,16 @@ exists(src/shared/qbs/qbs.pro) {
} }
# Create qbs documentation targets. # Create qbs documentation targets.
QBS_DOCS_BUILD_DIR=$$IDE_DOC_PATH DOC_FILES =
QBS_HTML_DOC_PATH=$$OUT_PWD/doc/html-qbs DOC_TARGET_PREFIX = qbs_
QBS_DOCS_INSTALL_DIR=$$INSTALL_DOC_PATH include(src/shared/qbs/doc/doc_shared.pri)
QDOC_BIN = $$QDOC
HELPGENERATOR = $$QHELPGENERATOR
include(src/shared/qbs/qbs_version.pri)
include(src/shared/qbs/doc/doc_targets.pri) include(src/shared/qbs/doc/doc_targets.pri)
docs.depends += qbs_docs 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 contains(QT_ARCH, i386): ARCHITECTURE = x86

2
src/shared/qbs

Submodule src/shared/qbs updated: 24000d556f...cc99f7de4e