diff options
author | Bea Lam <bea.lam@nokia.com> | 2012-05-28 11:56:24 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-31 10:40:41 +0200 |
commit | 4c671c046e8140bfb8372aab2c38aabe82b102b0 (patch) | |
tree | 7a70a75a553dcc806372a6b43ea39da05191db8a /src/quick/items/qquickloader.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 <christopher.adams@nokia.com>
Diffstat (limited to 'src/quick/items/qquickloader.cpp')
-rw-r--r-- | src/quick/items/qquickloader.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 2cde9effdc..843d0c18fd 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -173,7 +173,7 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const Here is a Loader that loads "Page1.qml" as a component when the \l MouseArea is clicked: - \snippet doc/snippets/qml/loader/simple.qml 0 + \snippet qml/loader/simple.qml 0 The loaded item can be accessed using the \l item property. @@ -205,8 +205,8 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const \li sizeloader.qml \li sizeitem.qml \row - \li \snippet doc/snippets/qml/loader/sizeloader.qml 0 - \li \snippet doc/snippets/qml/loader/sizeitem.qml 0 + \li \snippet qml/loader/sizeloader.qml 0 + \li \snippet qml/loader/sizeitem.qml 0 \row \li The red rectangle will be sized to the size of the root item. \li The red rectangle will be 50x50, centered in the root item. @@ -225,8 +225,8 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const \li application.qml \li MyItem.qml \row - \li \snippet doc/snippets/qml/loader/connections.qml 0 - \li \snippet doc/snippets/qml/loader/MyItem.qml 0 + \li \snippet qml/loader/connections.qml 0 + \li \snippet qml/loader/MyItem.qml 0 \endtable Alternatively, since \c MyItem.qml is loaded within the scope of the @@ -252,8 +252,8 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const \li application.qml \li KeyReader.qml \row - \li \snippet doc/snippets/qml/loader/focus.qml 0 - \li \snippet doc/snippets/qml/loader/KeyReader.qml 0 + \li \snippet qml/loader/focus.qml 0 + \li \snippet qml/loader/KeyReader.qml 0 \endtable Once \c KeyReader.qml is loaded, it accepts key events and sets |