diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-03 16:11:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-03 16:11:50 (GMT) |
| commit | b162ee295586d732292498945f335884bfa86b3e (patch) | |
| tree | f0acb6ddf0333ea092add2f3cc41625de75ef4db /tools/qdoc3 | |
| parent | c5ac774717f1ec2c99407e3ee3c337127d94329e (diff) | |
| parent | d5f33087eca066d70240e272d4109c5cca8001cf (diff) | |
| download | Qt-b162ee295586d732292498945f335884bfa86b3e.zip Qt-b162ee295586d732292498945f335884bfa86b3e.tar.gz Qt-b162ee295586d732292498945f335884bfa86b3e.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 4 |
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 |