diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-09-29 17:46:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 06:31:22 +0200 |
| commit | 99b68bc2593d2b1a9dc6f176caee5ec909827c05 (patch) | |
| tree | 9f9eb7b0646d30d5564ef07d345e76df793e4e9f /doc/doc.pro | |
| parent | 66ae9a33676202f39a5e2fe1edbdad9f31db52be (diff) | |
| download | qtdoc-99b68bc2593d2b1a9dc6f176caee5ec909827c05.tar.gz | |
Run qmake at "make docs" time
doc.pri requires QT.xxx.variable variables but they are not set
the first (and normally only) time qmake parses doc.pri. As a
result, you can't build docs without first manually running
"make qmake".
This change adds an explicit dependency such that all of the doc
commands (docs, online_docs, qch_docs, dita_docs) first force
qmake to run and process doc.pri again. This ensures that the
QT.xxx.variable variables have the appropriate values.
Change-Id: I688c432284605e9f56e7597f564f1c50e972f059
Reviewed-on: http://codereview.qt-project.org/5779
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'doc/doc.pro')
| -rw-r--r-- | doc/doc.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/doc.pro b/doc/doc.pro new file mode 100644 index 00000000..fdab02ac --- /dev/null +++ b/doc/doc.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +include($$OUT_PWD/../qtdoc.pri) +include(doc.pri) |