aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/qtqml.qdocconf
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Use correct style and modules for doc build.Casper van Donderen2012-06-251-2/+5
| | | | | | | | | | This change makes the "make docs" command use the correct style. Be aware that the "global" qdocconfs need to be in the QT_INSTALL_DOCS location before running "make docs", which effectively means that "make install" needs to be run in qtbase when doing a prefix build. Change-Id: Ib4635af0ad45717407a163968d629647898074dc Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Fix doc snippets paths and parsing errorsBea Lam2012-05-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtqml.qdocconf and qtquick.qdocconf now refer to the correct snippets and source directories. Snippet paths in .qdoc and .cpp files have been updated to refer to the new shortened path references, e.g. \snippet qml/file.cpp instead of \snippet doc/src/snippets/qml/file.cpp. This also deletes snippets from src/qml/doc/snippets that belonged under src/quick/doc/snippets (and were already duplicated there anyway) and restores some snippet files that shouldn't have been deleted. Also fixes some inline snippets to use \code .. \endcode instead of \qml .. \endqml as they contained javascript or partial QML snippets that were causing parsing errors from qdoc. There are still snippet errors arising from qmlintro.qdoc as the qmlintro snippets directory that it refers to cannot be located. There are also two references to a removed snippet identifier in examples/qml/cppextensions/plugins/plugin.cpp that need to be fixed in conjunction with the related docs in a later commit as the relevant code has changed and the docs are now invalid. Task-number: QTBUG-25721 Change-Id: I50c665245a74c140470c58a32546591d187dfe4b Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Doc: Moving QML docs for new doc structureJerome Pasion2012-05-091-0/+90
Change-Id: Id51e2cf10e8b5c5559bc4a375cb2db46c40bdf0a Reviewed-by: Alan Alpert <alan.alpert@nokia.com>