From 7a0ef0de34ff6ecdc3d1e4805c67c6a47254a8e8 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 15 Mar 2012 16:19:41 +0100
Subject: [PATCH] Fix DESTDIR of Qt Assistant.

Add missing DESTDIR for assistant.exe and Use QT.help.bins for all
assistant-related binaries.

Change-Id: I9ea4f1fbd5d5de11af2449afb66fd15c4144eac9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 src/assistant/assistant/assistant.pro                       | 4 ++++
 src/assistant/qcollectiongenerator/qcollectiongenerator.pro | 2 +-
 src/assistant/qhelpconverter/qhelpconverter.pro             | 2 +-
 src/assistant/qhelpgenerator/qhelpgenerator.pro             | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index 25983a1..f5cfbd5 100644
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 LANGUAGE = C++
 TARGET = assistant
+DESTDIR = $$QT.help.bins
 !isEmpty(QT.webkit.name) {
     QT += webkit
 } else {
@@ -117,3 +118,6 @@ contains(CONFIG, static): {
         DEFINES += USE_STATIC_SQLITE_PLUGIN
     }
 }
+
+target.path=$$[QT_INSTALL_BINS]
+INSTALLS += target
diff --git a/src/assistant/qcollectiongenerator/qcollectiongenerator.pro b/src/assistant/qcollectiongenerator/qcollectiongenerator.pro
index e8df8e4..b3493f5 100644
--- a/src/assistant/qcollectiongenerator/qcollectiongenerator.pro
+++ b/src/assistant/qcollectiongenerator/qcollectiongenerator.pro
@@ -1,6 +1,6 @@
 QT += network help-private
 TEMPLATE = app
-DESTDIR = $$QT.designer.bins
+DESTDIR = $$QT.help.bins
 TARGET = qcollectiongenerator
 CONFIG += qt \
     warn_on \
diff --git a/src/assistant/qhelpconverter/qhelpconverter.pro b/src/assistant/qhelpconverter/qhelpconverter.pro
index 8920d70..932562d 100644
--- a/src/assistant/qhelpconverter/qhelpconverter.pro
+++ b/src/assistant/qhelpconverter/qhelpconverter.pro
@@ -1,7 +1,7 @@
 QT += help widgets
 TEMPLATE = app
 TARGET = qhelpconverter
-DESTDIR = $$QT.designer.bins
+DESTDIR = $$QT.help.bins
 CONFIG += qt warn_on help
 
 target.path=$$[QT_INSTALL_BINS]
diff --git a/src/assistant/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro
index f6db4fa..f22ac70 100644
--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro
+++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = qhelpgenerator
-DESTDIR = $$QT.designer.bins
+DESTDIR = $$QT.help.bins
 CONFIG += qt warn_on help console
 CONFIG -= app_bundle
 QT += network help-private
-- 
2.7.4