diff options
| author | Bea Lam <[email protected]> | 2012-05-28 11:56:24 +1000 |
|---|---|---|
| committer | Qt by Nokia <[email protected]> | 2012-05-31 10:40:41 +0200 |
| commit | 4c671c046e8140bfb8372aab2c38aabe82b102b0 (patch) | |
| tree | 7a70a75a553dcc806372a6b43ea39da05191db8a /src/quick/items/qquickpathview.cpp | |
| parent | 0c7669b241aae96fca97acae0b628e627d5bfc4e (diff) | |
Fix doc snippets paths and parsing errors
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 <[email protected]>
Diffstat (limited to 'src/quick/items/qquickpathview.cpp')
| -rw-r--r-- | src/quick/items/qquickpathview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index bf4f9960ce..393f83b34a 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -453,11 +453,11 @@ void QQuickPathViewPrivate::regenerate() For example, if there is a simple list model defined in a file \c ContactModel.qml like this: - \snippet doc/snippets/qml/pathview/ContactModel.qml 0 + \snippet qml/pathview/ContactModel.qml 0 This data can be represented as a PathView, like this: - \snippet doc/snippets/qml/pathview/pathview.qml 0 + \snippet qml/pathview/pathview.qml 0 \image pathview.gif @@ -490,7 +490,7 @@ void QQuickPathViewPrivate::regenerate() this attached property directly as \c PathView.isCurrentItem, while the child \c nameText object must refer to this property as \c wrapper.PathView.isCurrentItem. - \snippet doc/snippets/qml/pathview/pathview.qml 1 + \snippet qml/pathview/pathview.qml 1 \b Note that views do not enable \e clip automatically. If the view is not clipped by another item or the screen, it will be necessary @@ -552,7 +552,7 @@ QQuickPathView::~QQuickPathView() This property may be used to adjust the appearance of the current item. - \snippet doc/snippets/qml/pathview/pathview.qml 1 + \snippet qml/pathview/pathview.qml 1 */ /*! @@ -1122,7 +1122,7 @@ bool QQuickPathView::isFlicking() const item in the delegate. Here is an example delegate: - \snippet doc/snippets/qml/pathview/pathview.qml 1 + \snippet qml/pathview/pathview.qml 1 */ QQmlComponent *QQuickPathView::delegate() const { |