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>

7 files changed, 23 insertions, 23 deletions

diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
index 28c310e495..8a3b7698a9 100644
--- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
+++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
@@ -456,7 +456,7 @@ In this tutorial, we've shown the basic steps for creating a QML extension:
 
 The \l{Integrating QML and C++} documentation shows
 other useful features that can be added to QML extensions. For example, we
-could use \l{Default Property}{default properties} to allow
+could use \l{Default Properties}{default properties} to allow
 slices to be added without using the \c slices property:
 
 \code
diff --git a/src/qml/doc/src/modules/cppplugins.qdoc b/src/qml/doc/src/modules/cppplugins.qdoc
index 887e7ccd0c..2875dd9a83 100644
--- a/src/qml/doc/src/modules/cppplugins.qdoc
+++ b/src/qml/doc/src/modules/cppplugins.qdoc
@@ -68,7 +68,7 @@
     as a new QML element. It provides the current time through \c hour and \c minute
     properties.
 
-    \snippet examples/qml/cppextensions/plugins/plugin.cpp 0
+    \snippet examples/qml/plugins/plugin.cpp 0
     \dots
 
     To make this type available, we create a plugin class named \c QExampleQmlPlugin
@@ -78,7 +78,7 @@
     definition to register the plugin with the Qt meta object system using a unique
     identifier for the plugin.
 
-    \snippet examples/qml/cppextensions/plugins/plugin.cpp plugin
+    \snippet examples/qml/plugins/plugin.cpp plugin
 
     The \c TimeModel class receives a \c{1.0} version of this plugin library, as
     a QML type called \c Time. The Q_ASSERT() macro can ensure the type namespace is
@@ -111,15 +111,15 @@
     that is built by the project (as shown above in the \c .pro file) so both of these
     need 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 component is
     accessible 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}.
 
 
 \section1 Reference
diff --git a/src/qml/doc/src/modules/qmldir.qdoc b/src/qml/doc/src/modules/qmldir.qdoc
index 9802cd744e..4f56b202b1 100644
--- a/src/qml/doc/src/modules/qmldir.qdoc
+++ b/src/qml/doc/src/modules/qmldir.qdoc
@@ -247,7 +247,7 @@ version of installed software, since a versioned import \e only imports types
 for that version, leaving other identifiers available, even if the actual
 installed version might otherwise provide those identifiers.
 
-See \l{examples/qml/cppextensions/plugins} for an example that uses C++
+See \l{examples/qml/plugins} for an example that uses C++
 plugins.
 
 
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc
index 8baef1d5bc..029e4baaf5 100644
--- a/src/qml/doc/src/qtqml.qdoc
+++ b/src/qml/doc/src/qtqml.qdoc
@@ -39,8 +39,8 @@ developers to extend the QML language with custom types and integrate QML code
 with JavaScript and C++.
 
 The Qt QML module provides both the \c QtQml QML module, which supplies
-\l{Qt QML - C++ Classes}{a set of core QML types} for creating QML
-applications, and the \c QtQml C++ module, which supplies \l{Qt QML - C++ Classes}{a set of C++
+\l{Qt QML Module - C++ Classes}{a set of core QML types} for creating QML
+applications, and the \c QtQml C++ module, which supplies \l{Qt QML Module - C++ Classes}{a set of C++
 APIs} for extending QML applications with custom types and integrating C++
 implementations with QML applications.
 
diff --git a/src/qml/doc/src/syntax/basics.qdoc b/src/qml/doc/src/syntax/basics.qdoc
index abfa6d5c0e..3cca5cb3d3 100644
--- a/src/qml/doc/src/syntax/basics.qdoc
+++ b/src/qml/doc/src/syntax/basics.qdoc
@@ -83,8 +83,8 @@ Here is a simple object declaration:
 
 \qml
 Rectangle {
-    width: 200
-    height: 200
+    width: 100
+    height: 100
     color: "red"
 }
 \endqml
@@ -97,8 +97,8 @@ The above object can be loaded by the engine if it is part of a \l{qtqml-documen
 import QtQuick 2.0
 
 Rectangle {
-    width: 200
-    height: 200
+    width: 100
+    height: 100
     color: "red"
 }
 \endqml
@@ -110,7 +110,7 @@ When placed into a \c .qml file and loaded by the QML engine, the above code cre
 \note If an object definition only has a small number of properties, it can be written on a single line like this, with the properties separated by semi-colons:
 
 \qml
-Rectangle { width: 200; height: 200; color: "red" }
+Rectangle { width: 100; height: 100; color: "red" }
 \endqml
 
 Obviously, the \l Rectangle object declared in this example is very simple indeed, as it defines nothing more than a few property values. To create more useful objects, an object declaration may define many other types of attributes: these are discussed in the \l{qtqml-syntax-objectattributes.html}{QML Object Attributes} documentation. Additionally, an object declaration may define child objects, as discussed below.
@@ -127,8 +127,8 @@ which in turn contains two \l GradientStop declarations:
 import QtQuick 2.0
 
 Rectangle {
-    width: 200
-    height: 200
+    width: 100
+    height: 100
 
     gradient: Gradient {
         GradientStop { position: 0.0; color: "yellow" }
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}
 */
 
 /*!