From c13d934b372fc207852d7b2e6824b4aeeb62a4e6 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 2 Nov 2009 21:36:26 +0100
Subject: [PATCH] macx: compile doc into the right directory instead of copying
it later
---
doc/doc.pri | 17 ++++-------------
qtcreator.pri | 2 ++
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/doc/doc.pri b/doc/doc.pri
index c9b423713e8..c39bc84b1cb 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -12,7 +12,7 @@ unix {
}
QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
-QCH_FILE = $$OUT_PWD/share/doc/qtcreator/qtcreator.qch
+QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch
unix {
html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
@@ -22,7 +22,7 @@ html_docs.commands = \"$$QDOC $$PWD/qtcreator.qdocconf\"
html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf
html_docs.files = $$QHP_FILE
-qch_docs.commands = $$HELPGENERATOR -o $$QCH_FILE $$QHP_FILE
+qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE
qch_docs.depends += html_docs
qch_docs.files = $$QCH_FILE
@@ -32,17 +32,8 @@ unix:!macx {
INSTALLS += qch_docs
}
-macx {
- DOC_DIR = "$${OUT_PWD}/bin/Qt Creator.app/Contents/Resources/doc"
- cp_docs.commands = mkdir -p \"$${DOC_DIR}\" ; $${QMAKE_COPY} \"$${QCH_FILE}\" \"$${DOC_DIR}\"
- cp_docs.depends += qch_docs
- docs.depends = cp_docs
- QMAKE_EXTRA_TARGETS += html_docs qch_docs cp_docs docs
-}
-!macx {
- docs.depends = qch_docs
- QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
-}
+docs.depends = qch_docs
+QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
OTHER_FILES = $$PWD/qtcreator.qdoc \
$$PWD/qtcreator.qdocconf
diff --git a/qtcreator.pri b/qtcreator.pri
index f78baa33f0d..4bc8e296149 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -60,6 +60,7 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
+ IDE_DOC_PATH = $$IDE_DATA_PATH/doc
contains(QT_CONFIG, ppc):CONFIG += ppc x86
copydata = 1
} else {
@@ -74,6 +75,7 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator
+ IDE_DOC_PATH = $$IDE_BUILD_TREE/share/doc/qtcreator
!isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
}
--
GitLab