diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:10:00 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:10:00 (GMT) |
| commit | 9878c1765332d9a68a8371b90888fe09e272c7a8 (patch) | |
| tree | a67a7a28f6737b17498a76bcc40d5ffd65e81572 /doc/doc.pri | |
| parent | 7d805a6717692b540c02b8caace25a0b47c7f0d6 (diff) | |
| parent | b52da4ab2179079a6aff95891786d2f6598048b5 (diff) | |
| download | Qt-9878c1765332d9a68a8371b90888fe09e272c7a8.zip Qt-9878c1765332d9a68a8371b90888fe09e272c7a8.tar.gz Qt-9878c1765332d9a68a8371b90888fe09e272c7a8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index e1efa21..a5db3c7 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -20,7 +20,7 @@ $$unixstyle { QDOC = $$replace(QDOC, "/", "\\") } ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf -QT_DOCUMENTATION = ($$QDOC -assistant qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ +QT_DOCUMENTATION = ($$QDOC -creator qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ (cd $$QT_BUILD_TREE && \ $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ |