AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QDoc: Fix make commands for QDoc manual.

Browse Source 
Change-Id: I55c3eae43928e87a0aa470127f9877741391deee
Reviewed-by: Martin Smith <martin.smith@nokia.com>
This commit is contained in:
Casper van Donderen 2012-07-19 12:39:41 +02:00 committed by Qt by Nokia
parent 27ab1b2e35
commit 91512af3d5
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/qdoc/doc/config/qdoc-project.qdocconf
View File

@ -3,15 +3,13 @@ include(macros.qdocconf)
include(qt-cpp-ignore.qdocconf) include(qt-cpp-ignore.qdocconf)
include(qt-defines.qdocconf) include(qt-defines.qdocconf)
indexes = $$MODULE_BUILD_TREE/doc/html/qt.index
sourceencoding = UTF-8 sourceencoding = UTF-8
outputencoding = UTF-8 outputencoding = UTF-8
naturallanguage = en_US naturallanguage = en_US
project = QDoc project = QDoc
description = QDoc3 Manual description = QDoc Manual
url = http://doc.qt.nokia.com/qdoc url = http://doc-snapshot.qt-project.org/qdoc
sources.fileextensions = "*.cpp *.qdoc *.mm *.qml" sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx" headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
@ -28,8 +26,8 @@ exampledirs = .. \
imagedirs = ../../../doc/src/templates/images \ imagedirs = ../../../doc/src/templates/images \
images images
outputdir = $$MODULE_BUILD_TREE/tools/qdoc/doc/html outputdir = ../html
tagfile = $$MODULE_BUILD_TREE/tools/qdoc/doc/html/qdoc.tags tagfile = ../html/qdoc.tags
qhp.projects = QDoc qhp.projects = QDoc

8
src/tools/qdoc/qdoc.pro
View File

@ -104,11 +104,11 @@ equals(QMAKE_DIR_SEP, /) {
QDOC = $$replace(QDOC, "/", "\\") QDOC = $$replace(QDOC, "/", "\\")
} }
html-docs.commands = cd \"$$QT_BUILD_TREE/doc\" && $$QDOC $$QT_SOURCE_TREE/tools/qdoc/doc/config/qdoc.qdocconf html-docs.commands = $$QDOC $$PWD/doc/config/qdoc.qdocconf
html-docs.files = $$QT_BUILD_TREE/doc/html html-docs.files = $$PWD/doc/html
qch-docs.commands = cd \"$$QT_BUILD_TREE/doc\" && $$QHELPGENERATOR $$QT_BUILD_TREE/tools/qdoc/doc/html/qdoc.qhp -o $$QT_BUILD_TREE/tools/qdoc/doc/qch/qdoc.qch qch-docs.commands = $$QHELPGENERATOR $$PWD/doc/html/qdoc.qhp -o $$PWD/doc/qch/qdoc.qch
qch-docs.files = $$QT_BUILD_TREE/tools/qdoc/doc/qch qch-docs.files = $$PWD/doc/qch
qch-docs.path = $$[QT_INSTALL_DOCS] qch-docs.path = $$[QT_INSTALL_DOCS]
qch-docs.CONFIG += no_check_exist directory qch-docs.CONFIG += no_check_exist directory