From b481732389789b059e7ac8ca51638542ee091f6e Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Thu, 18 Oct 2012 16:19:39 +0200
Subject: 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>
---
 doc/doc.pri | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc')

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, "[-.]", )
 
-- 
cgit v1.2.1