diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-25 14:53:09 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-25 14:53:09 (GMT) |
commit | 8d720825279c8bf06d28b1f756031402f117002b (patch) | |
tree | 5ea180f93387223c532d76f53d74054ea7a6f2b4 /doc/doc.pri | |
parent | 8928e37c8b1b375e74c5981915c034123de11b3d (diff) | |
parent | d6197028818e51e78249b029a823fde1b0ffde03 (diff) | |
download | Qt-8d720825279c8bf06d28b1f756031402f117002b.zip Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.gz Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.bz2 |
Merge branch 'master' of git:qt/qt-qml
Conflicts:
src/declarative/graphicsitems/qdeclarativeparticles.cpp
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 0fc4d72..aea5b08 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -21,7 +21,7 @@ $$unixstyle { } ADP_DOCS_QDOCCONF_FILE = qt-build-docs.qdocconf QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ - linguist.qdocconf qmake.qdocconf qml.qdocconf) && \ + linguist.qdocconf qmake.qdocconf qdeclarative.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 && \ |