diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-05 04:58:06 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-05 04:58:06 (GMT) |
commit | e8f2cc813ba4faf41677f65c51a990eea5df4308 (patch) | |
tree | 900af52bbf469d827de9f76f9a4653e77addeeed /doc/doc.pri | |
parent | fab8fa152901cb84132f11b52f950c0dbb6d7a23 (diff) | |
download | Qt-e8f2cc813ba4faf41677f65c51a990eea5df4308.zip Qt-e8f2cc813ba4faf41677f65c51a990eea5df4308.tar.gz Qt-e8f2cc813ba4faf41677f65c51a990eea5df4308.tar.bz2 |
Improve QML documentation viewing in Assistant.
The element pages now load correctly. A separate QML 'book' is also
generated, which will be targeted at non-C++ programmers.
Diffstat (limited to 'doc/doc.pri')
-rw-r--r-- | doc/doc.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index a4c77fe..367ef29 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -32,13 +32,14 @@ macx { ADP_DOCS_QDOCCONF_FILE = qt-build-docs.qdocconf } QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ - linguist.qdocconf qmake.qdocconf) && \ + linguist.qdocconf qmake.qdocconf qml.qdocconf) && \ (cd $$QT_BUILD_TREE && \ $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \ $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \ $$GENERATOR doc-build/html-linguist/linguist.qhp -o doc/qch/linguist.qch && \ - $$GENERATOR doc-build/html-qmake/qmake.qhp -o doc/qch/qmake.qch \ + $$GENERATOR doc-build/html-qmake/qmake.qhp -o doc/qch/qmake.qch && \ + $$GENERATOR doc-build/html-qml/qml.qhp -o doc/qch/qml.qch \ ) win32-g++:isEmpty(QMAKE_SH) { |