From d2bdb1f0e12a289c0be7ef720b12d1f4b5287a02 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Fri, 21 Aug 2009 11:16:46 +0200
Subject: move qdoc3 binary to bin, so we can use it for Qt Creator without
 hacks.

Most Linux distributions already move qdoc3 to that place for exactly
this reason anyway.

Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
---
 .gitignore            | 1 +
 .hgignore             | 1 +
 doc/doc.pri           | 4 ++--
 tools/qdoc3/qdoc3.pro | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index f088c69..57a1b84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@ bin/lconvert*
 bin/moc*
 bin/pixeltool*
 bin/qmake*
+bin/qdoc3*
 bin/qt3to4*
 bin/qtdemo*
 bin/rcc*
diff --git a/.hgignore b/.hgignore
index eb6ff05..ba5a1b0 100755
--- a/.hgignore
+++ b/.hgignore
@@ -41,6 +41,7 @@ bin/lupdate*
 bin/moc*
 bin/pixeltool*
 bin/qmake*
+bin/qdoc3*
 bin/qt3to4*
 bin/qtdemo*
 bin/rcc*
diff --git a/doc/doc.pri b/doc/doc.pri
index 13d481f..66953e6 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -14,9 +14,9 @@ win32:!win32-g++ {
 }
 
 $$unixstyle {
-    QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/tools/qdoc3/qdoc3 $$DOCS_GENERATION_DEFINES 
+    QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES
 } else {
-    QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/tools/qdoc3/qdoc3.exe $$DOCS_GENERATION_DEFINES
+    QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES
     QDOC = $$replace(QDOC, "/", "\\")
 }
 macx {
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 49a16e6..21b3bb9 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -7,6 +7,7 @@ DEFINES += QT_NO_CAST_TO_ASCII
 QT = core xml
 CONFIG += console
 CONFIG -= debug_and_release_target
+DESTDIR = $$QT_BUILD_TREE/bin
 #CONFIG += debug
 build_all:!build_pass {
     CONFIG -= build_all
-- 
cgit v0.12