diff options
| author | alex <alex.blasche@nokia.com> | 2012-06-27 14:31:48 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 08:12:17 +0200 |
| commit | fd9fb5c6f320c47a47c68251aaf6a9f5aa27a6c2 (patch) | |
| tree | 22733a70e82df4ba22ead8f554e9aec77cd0fbe4 | |
| parent | bc9bc3400ccecd9d7bcbbe5eee1fc49070874b4c (diff) | |
Use the recommended way of building module docs.
Change-Id: I57e6dd9b7323e8feaa2f7ed1bee0e24518f2b91e
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
| -rw-r--r-- | doc/doc.pri | 29 | ||||
| -rw-r--r-- | doc/qt5.qdocconf | 2 | ||||
| -rw-r--r-- | qtconnectivity.pro | 2 | ||||
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 2 |
4 files changed, 3 insertions, 32 deletions
diff --git a/doc/doc.pri b/doc/doc.pri deleted file mode 100644 index c3295e57..00000000 --- a/doc/doc.pri +++ /dev/null @@ -1,29 +0,0 @@ -QDOC = $$QT.core.bins/qdoc - -ONLINE_CONF = $$PWD/qt5.qdocconf -DITA_CONF = $$PWD/qt5-dita.qdocconf -QCH_CONF = #nothing yet - -$$unixstyle { -} else { - QDOC = $$replace(QDOC, "qdoc", "qdoc.exe") - ONLINE_CONF = $$replace(ONLINE_CONF, "/", "\\") - DITA_DOCS = $$replace(ONLINE_CONF, "/", "\\") -} - -# 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/qt5.qdocconf b/doc/qt5.qdocconf index 0997dfb1..f9e5b834 100644 --- a/doc/qt5.qdocconf +++ b/doc/qt5.qdocconf @@ -59,7 +59,7 @@ qhp.qtconnectivity.subprojects.classes.sortPages = true # Do NOT change the variables after this line unless you know what you are doing. -outputdir = html +outputdir = qtbluetooth outputformats = HTML examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml" diff --git a/qtconnectivity.pro b/qtconnectivity.pro index de9c362a..6f3b8fc4 100644 --- a/qtconnectivity.pro +++ b/qtconnectivity.pro @@ -26,5 +26,3 @@ module_qtconnectivity_examples.depends = module_qtconnectivity_src SUBDIRS += module_qtconnectivity_src \ module_qtconnectivity_tests \ module_qtconnectivity_examples - -include(doc/doc.pri) diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 59d4b70f..5e0c9843 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -5,6 +5,8 @@ QT = core load(qt_module_config) +QMAKE_DOCS = $$PWD/../../doc/qt5.qdocconf + # private dependencies QT += concurrent |