diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-04-24 14:27:55 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-04-24 15:03:37 +0200 |
| commit | 0c36c6a79854032372deb41cc4590a16b84ed3c8 (patch) | |
| tree | 118fd64862b0452680cc322c65c4f880d2fa3e28 /doc/doc.pri | |
| parent | 40c966d00bb2d33b7fc66fe1a68df2fc541efd1e (diff) | |
fix documentation target
We must pass QT_INSTALL_DOCS to qdoc, because qdoc doesn't know about
it in Qt 5.1.x.
Change-Id: Iccf5fc7bc194b0c5c39f0a8464977d1b85a4709d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index c3515e4f9..e0d28ca72 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -20,15 +20,16 @@ HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) VERSION_TAG = $$replace(QBS_VERSION, "[-.]", ) equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys - QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html QBS_VERSION=$$QBS_VERSION QBS_VERSION_TAG=$$VERSION_TAG $$QDOC_BIN + QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html QBS_VERSION=$$QBS_VERSION QBS_VERSION_TAG=$$VERSION_TAG QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS] $$QDOC_BIN } else:win32-g++* { # just mingw # The lack of spaces in front of the && is necessary! - QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set QBS_VERSION=$$QBS_VERSION&& set QBS_VERSION_TAG=$$VERSION_TAG&& $$QDOC_BIN + QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set QBS_VERSION=$$QBS_VERSION&& set QBS_VERSION_TAG=$$VERSION_TAG&& set QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]&& $$QDOC_BIN } else { # nmake QDOC = set SRCDIR=$$PWD $$escape_expand(\\n\\t) \ set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\\n\\t) \ set QBS_VERSION=$$QBS_VERSION $$escape_expand(\\n\\t) \ set QBS_VERSION_TAG=$$VERSION_TAG $$escape_expand(\\n\\t) \ + set QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS] \ $$QDOC_BIN } |