Merge remote-tracking branch 'origin/release' into stable

Change-Id: Iafc0497812acb7850cd4e72c49d63ec9c9320b58

4 files changed, 35 insertions, 12 deletions

diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index a27b0f82f7..f20890c378 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -60,4 +60,5 @@ headerdirs += ../../plugins
 sourcedirs += ../../plugins
 
 #exclude certain directories
-excludedirs = ../../imports/dialogs
+excludedirs += ../../imports/dialogs \
+               ../../imports/models
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index bb488ac2f2..6863758455 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -56,19 +56,19 @@ information about the concepts which are central to \c QtQuick.
     Qt Quick includes several submodules which contain additional types.
 
     \list
-    \li \l{QtQuick.XmlListModel 2}{XML List Model} - contains types
+    \li \l{Qt Quick XmlListModel QML Types}{XML List Model} - contains types
     for creating models from XML data
-    \li \l{QtQuick.LocalStorage 2}{Local Storage} - a submodule
+    \li \l{Qt Quick Local Storage QML Types}{Local Storage} - a submodule
     containing a JavaScript interface for an SQLite database
-    \li \l{QtQuick.Particles 2}{Particles} - provides a particle
+    \li \l{Qt Quick Particles QML Types}{Particles} - provides a particle
     system for QML applications
-    \li \l{QtQuick.Window 2}{Window} - contains types for creating
+    \li \l{Qt Quick Window QML Types}{Window} - contains types for creating
     top-level windows and accessing screen information
-    \li \l{QtQuick.Dialogs 1}{Dialogs} - contains types for creating and
+    \li \l{Qt Quick Dialogs QML Types}{Dialogs} - contains types for creating and
     interacting with system dialogs
-    \li \l{QtQuick.Controls 1.0}{Controls} - provides a set of reusable
+    \li \l{Qt Quick Controls QML Types}{Controls} - provides a set of reusable
     UI components
-    \li \l{QtQuick.Layouts 1.0}{Layouts} - contains types that are used
+    \li \l{Qt Quick Layouts QML Types}{Layouts} - contains types that are used
     to arrange items in the user interface
     \endlist
 
@@ -234,13 +234,26 @@ Animation paths
 
 \section2 Model/View Types And Data Storage And Access
 
-Models And Model Data
+QML Lists and Models
+
+The \l{Qt QML Models QML Types}{Qt QML Models} submodule provides the types for
+structuring data with models and lists.
+\list
+\li \l ListModel - Defines a list of data
+\li \l ListElement - Defines a data item in a \l ListModel
+\endlist
+
+These QML types are part of Qt Quick for backwards compatibility, but for
+newer applications, \l{Qt QML Models QML Types}{Qt QML Models} provides
+the same functionality.
 \list
-\li \l {QtQml2::ListModel}{ListModel} - Defines a list of data
-\li \l {QtQml2::ListElement}{ListElement} - Defines a data item in a \l {QtQml2::ListModel}{ListModel}
 \li \l {VisualItemModel} - Contains items that already defines its own visual delegate
 \li \l {VisualDataModel} - Encapsulates a model and a delegate
 \li \l {VisualDataGroup} - Encapsulates a filtered set of visual data items
+\endlist
+
+XML Lists
+\list
 \li \l {XmlListModel} - Specifies a model using XPath expressions
 \li \l {XmlRole} - Specifies a role for an \l {XmlListModel}
 \endlist
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index 0a4d276cb8..deb6aa164c 100644
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -43,7 +43,7 @@ QML types for creating user interfaces with the QML language, and a
 \l{Qt Quick C++ Classes}{C++ API} for extending QML applications with C++ code.
 
 \note From Qt 5.1, a set of Qt Quick based UI controls is available to
-create classic desktop-style user interfaces. Please see \l{Qt Quick Controls}
+create user interfaces. Please see \l{Qt Quick Controls}
 for more information.
 
 For those new to QML and Qt Quick, please see
diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc
index 2b865073d3..973d41dca2 100644
--- a/src/quick/doc/src/whatsnew.qdoc
+++ b/src/quick/doc/src/whatsnew.qdoc
@@ -44,6 +44,15 @@ features introduced by the new import and new classes in Qt 5.1:
 \li New \l TextEdit properties: selectByKeyboard and textDocument
 \li A \l Window declared inside another Window or \l Item will automatically be
     transient for (centered upon) the outer window.
+\li These types are now part of \l{Qt QML}:
+    \list
+    \li \l {VisualItemModel}
+    \li \l {VisualDataModel} - Encapsulates a model and a delegate
+    \li \l {VisualDataGroup}
+    \endlist
+    These types are kept due to compatibility reasons and are replaced by the
+    \l{Qt QML Models QML Types}{Qt QML Models} types.
+    \endlist
 \endlist
 
 \section2 New Submodules