diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-08-21 09:16:46 (GMT) |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-08-21 10:22:12 (GMT) |
| commit | d2bdb1f0e12a289c0be7ef720b12d1f4b5287a02 (patch) | |
| tree | 91169c7ddcb563b7285eb6e34dc46b63ee8bde58 | |
| parent | 8feda9e2802022ae3da3d9ba0913b0130b0bdc40 (diff) | |
| download | Qt-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>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | .hgignore | 1 | ||||
| -rw-r--r-- | doc/doc.pri | 4 | ||||
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 1 |
4 files changed, 5 insertions, 2 deletions
@@ -52,6 +52,7 @@ bin/lconvert* bin/moc* bin/pixeltool* bin/qmake* +bin/qdoc3* bin/qt3to4* bin/qtdemo* bin/rcc* @@ -41,6 +41,7 @@ bin/lupdate* bin/moc* bin/pixeltool* bin/qmake* +bin/qdoc3* bin/qt3to4* bin/qtdemo* bin/rcc* 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 { diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index 49a16e6..21b3bb9 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -7,6 +7,7 @@ DEFINES += QT_NO_CAST_TO_ASCII QT = core xml CONFIG += console CONFIG -= debug_and_release_target +DESTDIR = $$QT_BUILD_TREE/bin #CONFIG += debug build_all:!build_pass { CONFIG -= build_all |