summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2009-08-21 09:16:46 (GMT)
committerDaniel Molkentin <daniel.molkentin@nokia.com>2009-08-21 10:22:12 (GMT)
commitd2bdb1f0e12a289c0be7ef720b12d1f4b5287a02 (patch)
tree91169c7ddcb563b7285eb6e34dc46b63ee8bde58 /doc
parent8feda9e2802022ae3da3d9ba0913b0130b0bdc40 (diff)
downloadQt-d2bdb1f0e12a289c0be7ef720b12d1f4b5287a02.zip
Qt-d2bdb1f0e12a289c0be7ef720b12d1f4b5287a02.tar.gz
Qt-d2bdb1f0e12a289c0be7ef720b12d1f4b5287a02.tar.bz2
move qdoc3 binary to bin, so we can use it for Qt Creator without hacks.
Most Linux distributions already move qdoc3 to that place for exactly this reason anyway. Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/doc.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index 13d481f..66953e6 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -14,9 +14,9 @@ win32:!win32-g++ {
}
$$unixstyle {
- QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/tools/qdoc3/qdoc3 $$DOCS_GENERATION_DEFINES
+ QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES
} else {
- QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/tools/qdoc3/qdoc3.exe $$DOCS_GENERATION_DEFINES
+ QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES
QDOC = $$replace(QDOC, "/", "\\")
}
macx {