diff options
| author | alex <alex.blasche@nokia.com> | 2012-06-22 13:20:46 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-22 08:19:02 +0200 |
| commit | aacc64fbcf66d9a50dedb974b7e2fce86da4d5cf (patch) | |
| tree | c57cafe228d6706b1d3207706cc6ac7d93418446 /doc | |
| parent | 80051eaddc1131503e4dc40300d79e68fefb69e5 (diff) | |
Hook doc generation into global QMAKE_DOCS context
Change-Id: I3b654018a9d29719e56b928205f441e193fc01a3
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/qtsensors.qdocconf | 2 | ||||
| -rw-r--r-- | doc/config/qtsensors_doc.pri | 41 | ||||
| -rw-r--r-- | doc/doc.pro | 4 |
3 files changed, 1 insertions, 46 deletions
diff --git a/doc/config/qtsensors.qdocconf b/doc/config/qtsensors.qdocconf index 9499335d..e6bb1a5d 100644 --- a/doc/config/qtsensors.qdocconf +++ b/doc/config/qtsensors.qdocconf @@ -70,7 +70,7 @@ qhp.qtsensors.subprojects.classes.sortPages = true # Do NOT change the variables after this line unless you know what you are doing. -outputdir = $PWD/doc/html +outputdir = ../../doc/qtsensors outputformats = HTML examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml" diff --git a/doc/config/qtsensors_doc.pri b/doc/config/qtsensors_doc.pri deleted file mode 100644 index 7b879efc..00000000 --- a/doc/config/qtsensors_doc.pri +++ /dev/null @@ -1,41 +0,0 @@ - -win32:!win32-g++ { - unixstyle = false -} else:win32-g++:isEmpty(QMAKE_SH) { - unixstyle = false -} else { - unixstyle = true -} - -QDOC = $$QT.core.bins/qdoc3 - -ONLINE_CONF = $$PWD/qtsensors.qdocconf -DITA_CONF = $$PWD/qtsensors-dita.qdocconf -QCH_CONF = #nothing yet - -$$unixstyle { -} else { - QDOC = $$replace(QDOC, "qdoc", "qdoc3.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 $$OUT_PWD/../html" \ - "-r $$OUT_PWD/../ditaxml" - - -OTHER_FILES += \ - doc/src/*.qdoc \ - doc/src/examples/*.qdoc \ - doc/src/imports/*.qdoc diff --git a/doc/doc.pro b/doc/doc.pro deleted file mode 100644 index 94ad926c..00000000 --- a/doc/doc.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs - -# Doc snippets use widgets -!isEmpty(QT.widgets.name): SUBDIRS += src/snippets |