diff options
author | Kai Koehne <kai.koehne@digia.com> | 2012-10-18 16:19:39 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@digia.com> | 2012-10-18 17:24:10 +0200 |
commit | b481732389789b059e7ac8ca51638542ee091f6e (patch) | |
tree | d8cf5bcb9f4566e7c2f987a6ae7adc325ae6ac3b /doc | |
parent | 9ac92a938b7a024e0395c7ffb52d33ed05e324a8 (diff) | |
download | qt-creator-b481732389789b059e7ac8ca51638542ee091f6e.tar.gz |
Doc: Let 'make docs' also work without window manager
qhelpgenerator uses QtGuiWindow, but e.g. for build farms there's
no window manager available.
Change-Id: Id33af086ff86b0ee4778693a14da61832e360e7d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/doc.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index c163bce40c..97d4c3055e 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,10 +1,11 @@ greaterThan(QT_MAJOR_VERSION, 4) { + HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) -platform minimal QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) } else { + HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) } -HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", ) |