diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-07 10:58:01 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-07 10:58:01 (GMT) |
| commit | 0a4f8a73165da5ec274409dffa1de921421d9bb1 (patch) | |
| tree | a9209a8d091da93155c6b01e1ecd093838ec72c6 /doc | |
| parent | 47008b211fe3b972077466e593a2a9016446bab2 (diff) | |
| parent | 599ffaef76eb92af2bbce6e5baff539958bfdd14 (diff) | |
| download | Qt-0a4f8a73165da5ec274409dffa1de921421d9bb1.zip Qt-0a4f8a73165da5ec274409dffa1de921421d9bb1.tar.gz Qt-0a4f8a73165da5ec274409dffa1de921421d9bb1.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index d4fdcd8..463c447 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -34,12 +34,9 @@ win32-g++:isEmpty(QMAKE_SH) { QT_DOCUMENTATION = $$replace(QT_DOCUMENTATION, "/", "\\\\") } - -!wince*:!cross_compile:SUBDIRS += tools/qdoc3 - # Build rules: adp_docs.commands = ($$QDOC $$ADP_DOCS_QDOCCONF_FILE) -adp_docs.depends += sub-tools-qdoc3 +adp_docs.depends += sub-tools # qdoc3 qch_docs.commands = $$QT_DOCUMENTATION qch_docs.depends += sub-tools |