summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-11-04 09:33:23 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-11-04 09:33:23 (GMT)
commit5549cd45e319e3019e2aac64a2143977f860e883 (patch)
tree288ac8f55fb634d81ee62c8eddc08929971d02e0 /tools/qdoc3
parentfa4ee0aadd00c976a70ef63aeb5be1d4eb52f928 (diff)
parent4b0ced38a3e52836a8122bee95fa9056818e1206 (diff)
downloadQt-5549cd45e319e3019e2aac64a2143977f860e883.zip
Qt-5549cd45e319e3019e2aac64a2143977f860e883.tar.gz
Qt-5549cd45e319e3019e2aac64a2143977f860e883.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools/qdoc3')
-rw-r--r--tools/qdoc3/qdoc3.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index ae0bf25..d47e066 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -120,9 +120,9 @@ SOURCES += apigenerator.cpp \
qtPrepareTool(QDOC, qdoc3)
-docs.commands = $$QDOC qdoc-manual.qdocconf
+html-docs.commands = cd \"$$PWD/doc\" && $$QDOC qdoc-manual.qdocconf
-QMAKE_EXTRA_TARGETS += docs
+QMAKE_EXTRA_TARGETS += html-docs
target.path = $$[QT_INSTALL_BINS]
INSTALLS += target