summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-12-07 22:31:59 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-12-07 22:31:59 (GMT)
commit7c5bff438bcad62c79ba4febdd3f07fce396803e (patch)
treef5245f91df0bca084a9b2ea9711d6c4f82d754f8 /doc
parentef5850afa68f148ab72d46bf64a8a1be1a70bb3b (diff)
parent0a4f8a73165da5ec274409dffa1de921421d9bb1 (diff)
downloadQt-7c5bff438bcad62c79ba4febdd3f07fce396803e.zip
Qt-7c5bff438bcad62c79ba4febdd3f07fce396803e.tar.gz
Qt-7c5bff438bcad62c79ba4febdd3f07fce396803e.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'doc')
-rw-r--r--doc/doc.pri5
1 files changed, 1 insertions, 4 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index a5e4a82..9d7d5da 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -35,12 +35,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