diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-15 19:47:45 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 12:54:28 +0200 |
| commit | a305423c9237318930b1b82d6fb7c5ac3e07877f (patch) | |
| tree | 9eb69bf38987fb601ad88c37a0c5b3468549bf7d /doc/doc.pro | |
| parent | 690e48eb3d45c5bc018e9c8271e74ca5881b0056 (diff) | |
Make the qtdoc repo part of the modularized build
The monolithic build is now partially removed, but there's still a lot
of cruft left that we'll remove once we know what we need or not need.
This introduces a bunch of qdoc warnings for examplee documentation that
live in the qdoc repo, but that references an example that lives in the
module. These example docs should be moved to the corresponding module.
Change-Id: I15f9f9087f1e96786ce2a49a7192f1015cb192db
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'doc/doc.pro')
| -rw-r--r-- | doc/doc.pro | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/doc/doc.pro b/doc/doc.pro index 488b191a9..cdc56c815 100644 --- a/doc/doc.pro +++ b/doc/doc.pro @@ -1,2 +1,12 @@ -TEMPLATE = subdirs -include(doc.pri) +TEMPLATE = aux + +QMAKE_DOCS = $$PWD/config/qtdoc.qdocconf + +# FIXME: Refactor into load(qt_docs) or something similar +# that can be used from all non-module projects that also +# provide modularized docs, for example qmake. +QTDIR = $$[QT_HOST_PREFIX] +exists($$QTDIR/.qmake.cache): \ + QMAKE_DOCS_OUTPUTDIR = $$QTDIR/doc/qtdoc +else: \ + QMAKE_DOCS_OUTPUTDIR = $$OUT_PWD/qtdoc |