AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Centralize place where we ensure qdoc is built before generating docs

Browse Source 
Change-Id: Ie0220d3c76990f6052edcd8c738e4e2807f35c71
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
Tor Arne Vestbø 2012-10-09 17:37:23 +02:00 committed by The Qt Project
parent 96bc659ea1
commit 3f7388bc1e
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/bootstrap/bootstrap.pro
View File

@ -130,9 +130,6 @@ freeze_target.target = freeze
freeze_target.commands = freeze_target.commands =
freeze_target.depends = first freeze_target.depends = first
QMAKE_EXTRA_TARGETS += freeze_target QMAKE_EXTRA_TARGETS += freeze_target
docs.commands =
docs.depends = first
QMAKE_EXTRA_TARGETS += docs
# We need the forwarding headers before their respective modules are built, # We need the forwarding headers before their respective modules are built,
# so do a minimal syncqt run. # so do a minimal syncqt run.

5
src/tools/qdoc/qdoc.pro
View File

@ -124,9 +124,4 @@ QMAKE_EXTRA_TARGETS += html-docs qch-docs
target.path = $$[QT_HOST_BINS] target.path = $$[QT_HOST_BINS]
INSTALLS += target INSTALLS += target
# Ensure that qdoc is built before we generate the docs
docs.commands =
docs.depends = first
QMAKE_EXTRA_TARGET += docs
load(qt_targets) load(qt_targets)

7
src/tools/tools.pro
View File

@ -34,3 +34,10 @@ contains(QT_CONFIG, dbus) {
} }
SUBDIRS = $$TOOLS_SUBDIRS SUBDIRS = $$TOOLS_SUBDIRS
# Ensure qdoc is built before making any docs. We rely on the existing dependency
# on bootstrap for each of the other tools to ensure they also build qdoc first,
# and likewise, the dependency of the rest of the build on tools, src, etc.
bootstrap_docs.depends += $${src_tools_qdoc.target}-make_first
bootstrap_docs.target = $${src_tools_bootstrap.target}-docs
QMAKE_EXTRA_TARGETS += bootstrap_docs