summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/doc.pri31
-rw-r--r--doc/src/bluetooth-overview.qdoc2
2 files changed, 24 insertions, 9 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index 459e9baa..c3295e57 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -1,14 +1,29 @@
-OTHER_FILES += \
- $$PWD/qt5.qdocconf \
- $$PWD/qt5-dita.qdocconf
+QDOC = $$QT.core.bins/qdoc
-docs_target.target = docs
-docs_target.commands = qdoc3 $$PWD/qt5.qdocconf
+ONLINE_CONF = $$PWD/qt5.qdocconf
+DITA_CONF = $$PWD/qt5-dita.qdocconf
+QCH_CONF = #nothing yet
-ditadocs_target.target = ditadocs
-ditadocs_target.commands = qdoc3 $$PWD/qt5-dita.qdocconf
+$$unixstyle {
+} else {
+ QDOC = $$replace(QDOC, "qdoc", "qdoc.exe")
+ ONLINE_CONF = $$replace(ONLINE_CONF, "/", "\\")
+ DITA_DOCS = $$replace(ONLINE_CONF, "/", "\\")
+}
-QMAKE_EXTRA_TARGETS = docs_target ditadocs_target
+# Build rules
+docs.depends = dita_docs online_docs qch_docs
+
+online_docs.commands = $$QDOC $$ONLINE_CONF
+
+dita_docs.commands = $$QDOC $$DITA_CONF
+
+qch_docs.commands = #no commands yet
+
+QMAKE_EXTRA_TARGETS += docs dita_docs online_docs qch_docs
QMAKE_CLEAN += \
"-r $$PWD/html" \
"-r $$PWD/ditaxml"
+
+
+OTHER_FILES +=
diff --git a/doc/src/bluetooth-overview.qdoc b/doc/src/bluetooth-overview.qdoc
index 05cf6d42..313a1f0c 100644
--- a/doc/src/bluetooth-overview.qdoc
+++ b/doc/src/bluetooth-overview.qdoc
@@ -28,7 +28,7 @@
/*!
\ingroup technology-apis
\title Qt Bluetooth Module
-\page qtbluetooth-overview.html
+\page index-qtbluetooth-module.html
\brief The Qt Bluetooth API enables connectivity with other Bluetooth enabled devices.
\tableofcontents