diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-02 21:36:26 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-24 20:43:55 +0100 |
| commit | c13d934b372fc207852d7b2e6824b4aeeb62a4e6 (patch) | |
| tree | f47305b8f164f486827f4dba42ae7da252c31961 /doc/doc.pri | |
| parent | 0271da5f37ddd33f067cb28bc237dadf59de1e93 (diff) | |
macx: compile doc into the right directory instead of copying it later
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index c9b423713e..c39bc84b1c 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 |