diff options
author | Bea Lam <bea.lam@nokia.com> | 2012-08-28 11:21:19 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-28 06:21:58 +0200 |
commit | 87679b3499e68957998b98bf13b6d98b3aa8b4c3 (patch) | |
tree | 4e6d613173a1e6abf5ef0afc65a615fd6b7fdbfe /src/qml/qml | |
parent | abaee0a83588f86740ea553ff7623a789b6b787a (diff) |
Docs - add missing images and code, clean up sections
Includes the removal of concepts/modelviewsdata/localstorage.qdoc
since that is a duplicate of the existing Local Storage module docs.
Also removes classes from whatsnew.qdoc that are internal.
Change-Id: I4170c1797bbec09bb67784b0b2ad67fd990365a8
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/qml/qml')
-rw-r--r-- | src/qml/qml/qqmlextensionplugin.cpp | 12 | ||||
-rw-r--r-- | src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp index f75b2bdab2..58227072d8 100644 --- a/src/qml/qml/qqmlextensionplugin.cpp +++ b/src/qml/qml/qqmlextensionplugin.cpp @@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE as a new QML element. It provides the current time through \c hour and \c minute properties, like this: - \snippet examples/qml/cppextensions/plugins/plugin.cpp 0 + \snippet examples/qml/plugins/plugin.cpp 0 \dots To make this class available as a QML type, create a plugin that registers @@ -84,9 +84,9 @@ QT_BEGIN_NAMESPACE module will be named \c com.nokia.TimeExample (as defined in the project file further below). - \snippet examples/qml/cppextensions/plugins/plugin.cpp plugin + \snippet examples/qml/plugins/plugin.cpp plugin \codeline - \snippet examples/qml/cppextensions/plugins/plugin.cpp export + \snippet examples/qml/plugins/plugin.cpp export This registers the \c TimeModel class with the 1.0 version of this plugin library, as a QML type called \c Time. The Q_ASSERT statement @@ -110,14 +110,14 @@ QT_BEGIN_NAMESPACE should be bundled with the plugin, so it needs to be specified in the \c qmldir file: - \quotefile examples/qml/cppextensions/plugins/com/nokia/TimeExample/qmldir + \quotefile examples/qml/plugins/com/nokia/TimeExample/qmldir Once the project is built and installed, the new \c Time element can be used by any QML component that imports the \c com.nokia.TimeExample module: - \snippet examples/qml/cppextensions/plugins/plugins.qml 0 + \snippet examples/qml/plugins/plugins.qml 0 - The full source code is available in the \l {qml/cppextensions/plugins}{plugins example}. + The full source code is available in the \l {qml/plugins}{plugins example}. The \l {Writing QML Extensions with C++} tutorial also contains a chapter on creating QML plugins. diff --git a/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp b/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp index 4c31e557bc..ead606088f 100644 --- a/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp +++ b/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp @@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE The QtQuick 1 version of this class is named QDeclarativeNetworkAccessManagerFactory. - \sa {qml/cppextensions/networkaccessmanagerfactory}{NetworkAccessManagerFactory example} + \sa {qml/networkaccessmanagerfactory}{NetworkAccessManagerFactory example} */ /*! |