From ead66987d4f0459281ee4ee59216448732c623a6 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Tue, 4 Apr 2017 14:04:58 +0200
Subject: 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>
---
 qtcreator.pro | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'qtcreator.pro')

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
-- 
cgit v1.2.3