From 4501ee9ed50fbfc348237eeea973e0aecebeaf89 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 7 Jan 2009 15:47:25 +0100
Subject: [PATCH] Fixes: - Mac build (docs) and toplevel "make docs" target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
RevBy: - bjørn
---
doc/doc.pri | 21 +++++++++++++--------
doc/doc.pro | 1 -
qtcreator.pro | 2 ++
src/app/app.pro | 4 +---
4 files changed, 16 insertions(+), 12 deletions(-)
delete mode 100644 doc/doc.pro
diff --git a/doc/doc.pri b/doc/doc.pri
index 5d58a28c3e6..cb800823ec4 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -1,16 +1,13 @@
-# Generate docs. Does not work for shadow builds and never will.
-# (adding a "docs" make target).
-
unix {
- QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/html $$(QTDIR)/tools/qdoc3/qdoc3
+ QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/tools/qdoc3/qdoc3
HELPGENERATOR = qhelpgenerator
} else {
QDOC = $$(QTDIR)\tools\qdoc3\release\qdoc3.exe
HELPGENERATOR = qhelpgenerator
}
-QHP_FILE = $$OUT_PWD/html/qtcreator.qhp
-QCH_FILE = $$OUT_PWD/qtcreator.qch
+QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
+QCH_FILE = $$OUT_PWD/doc/qtcreator.qch
html_docs.commands =$$QDOC $$PWD/qtcreator.qdocconf
html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf
@@ -20,6 +17,14 @@ qch_docs.commands = $$HELPGENERATOR -o $$QCH_FILE $$QHP_FILE
qch_docs.depends += html_docs
qch_docs.files = $$QCH_FILE
-docs.depends = qch_docs
+macx {
+ cp_docs.commands = $${QMAKE_COPY_DIR} $${OUT_PWD}/doc $${OUT_PWD}/bin/QtCreator.app/Contents/Resources
+ 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
+}
-QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
diff --git a/doc/doc.pro b/doc/doc.pro
deleted file mode 100644
index 8337190b227..00000000000
--- a/doc/doc.pro
+++ /dev/null
@@ -1 +0,0 @@
-include(doc.pri)
diff --git a/qtcreator.pro b/qtcreator.pro
index 13f0b26fa3e..9a5e467eb6e 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -2,3 +2,5 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = src
+
+include(doc/doc.pri)
diff --git a/src/app/app.pro b/src/app/app.pro
index a0e120da1c6..bc8376bbddb 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -36,13 +36,11 @@ macx {
SCHEMES.files = $$IDE_SOURCE_TREE/bin/schemes
GDBDEBUGGER.path = Contents/Resources
GDBDEBUGGER.files = $$IDE_SOURCE_TREE/bin/gdbmacros
- DOC.path = Contents/Resources/doc
- DOC.files = $$IDE_SOURCE_TREE/doc/qtcreator.qch
LICENSE.path = Contents/Resources
LICENSE.files = $$IDE_SOURCE_TREE/bin/license.txt
RUNINTERMINAL.path = Contents/Resources
RUNINTERMINAL.files = $$IDE_SOURCE_TREE/bin/runInTerminal.command
- QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER DOC LICENSE RUNINTERMINAL
+ QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER LICENSE RUNINTERMINAL
QMAKE_INFO_PLIST = $$PWD/Info.plist
}
!macx {
--
GitLab