From c6e9c041a76587c68aa6d866288e2e6093db5139 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Mon, 26 Oct 2009 15:35:37 +0100
Subject: Do not require QTDIR to be set.

Reviewed-By: Oswald Buddenhagen
---
 doc/doc.pri | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'doc/doc.pri')

diff --git a/doc/doc.pri b/doc/doc.pri
index b15059163f..5c93f3d3a5 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -1,15 +1,14 @@
-unix:QDOC_BIN = $$(QTDIR)/bin/qdoc3
-win32:QDOC_BIN = $$(QTDIR)/bin/qdoc3.exe
+QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc3
 win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\")
 
 unix {
     QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN 
-    HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator
+    HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator
 } else {
     QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN
     # Always run qhelpgenerator inside its own cmd; this is a workaround for
     # an unusual bug which causes qhelpgenerator.exe to do nothing
-    HELPGENERATOR = cmd /C $$(QTDIR)\bin\qhelpgenerator.exe
+    HELPGENERATOR = cmd /C $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\")
 }
 
 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
-- 
cgit v1.2.3