diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-09 17:37:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 14:44:51 +0200 |
| commit | 3f7388bc1e7632b85a8d4a9493db3a7ba33d4153 (patch) | |
| tree | 9dc4e0da2fe12b549283bdd2c27d374241f5bd67 /src | |
| parent | 96bc659ea1acdafcf44fab4a09caf013d048f874 (diff) | |
Centralize place where we ensure qdoc is built before generating docs
Change-Id: Ie0220d3c76990f6052edcd8c738e4e2807f35c71
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 3 | ||||
| -rw-r--r-- | src/tools/qdoc/qdoc.pro | 5 | ||||
| -rw-r--r-- | src/tools/tools.pro | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index b5005991ec..ffc369fd18 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -130,9 +130,6 @@ freeze_target.target = freeze freeze_target.commands = freeze_target.depends = first 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, # so do a minimal syncqt run. diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro index 8d3b4e49ae..0c3521c5d7 100644 --- a/src/tools/qdoc/qdoc.pro +++ b/src/tools/qdoc/qdoc.pro @@ -124,9 +124,4 @@ QMAKE_EXTRA_TARGETS += html-docs qch-docs target.path = $$[QT_HOST_BINS] INSTALLS += target -# Ensure that qdoc is built before we generate the docs -docs.commands = -docs.depends = first -QMAKE_EXTRA_TARGET += docs - load(qt_targets) diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 11031b4cee..c67d6bfd76 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -34,3 +34,10 @@ contains(QT_CONFIG, dbus) { } 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 |