Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7

Conflicts:
	doc/src/declarative/propertybinding.qdoc
	doc/src/overviews.qdoc
	src/declarative/util/qdeclarativeanimation.cpp
	src/declarative/util/qdeclarativeview.cpp

1 files changed, 59 insertions, 4 deletions

diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index f51e320..2e49a7f 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -42,8 +42,8 @@
     Qt is a cross-platform application and UI framework for writing
     web-enabled applications for desktop, mobile, and embedded
     operating systems. This page contains links to articles and overviews
-	explaining key components and techniques used in Qt development.
-	
+    explaining key components and techniques used in Qt development.
+
     \generatelist {related}
  */
 
@@ -112,7 +112,7 @@
   \ingroup technology-apis
   \ingroup best-practices
   \ingroup qt-basic-concepts
-  
+
 
   These pages document Qt's API's for using SQL database systems
   in Qt applications.
@@ -133,7 +133,7 @@
 
     \generatelist{related}
 */
-/*! 
+/*!
 
 	\group licensing
 	\title Qt Licenses and Credits
@@ -146,3 +146,58 @@
 	\generatelist {related}
 
 */
+
+/*!
+    \group qml-best-practices
+    \title QML Best Practices Guides
+
+    \brief QML Programming Best Practices Guides
+
+    These documents provide guidelines and best practices for using QML and Qt
+    to solve specific technical problems.
+
+    \generatelist {related}
+*/
+/*!
+    \group qml-features
+    \title QML Features
+
+    \brief Features of the QML Language
+
+    These are overviews of the many features of the QML language.
+
+    \list
+    \o \l{QML Syntax}
+    \o \l{Property Binding}
+    \o \l{QML Basic Types}{Data Types}
+    \o \l{QML Basic Elements}{Basic Elements}
+    \o \l{Using QML Positioner and Repeater Items}{Component Layouts}
+    \o \l{Anchor-based Layout in QML}{Layouts using Anchors}
+    \o \l{Mouse Events}
+    \o \l{QML Text Handling and Validators}{Text Handling and Validators}
+    \o \l{Keyboard Focus in QML}{Keyboard Focus}
+    \o \l{Importing Reusable Components}
+    \o \l{QML States}{States}
+    \o \l{QML Animation and Transitions}{Animation and Transitions}
+    \o \l{QML Data Models}{Structuring Data with Models}
+    \o \l{Presenting Data with Views}
+    \o \l{Extending QML Functionalities using C++}
+    \o \l{Using QML Bindings in C++ Applications}
+    \o \l{Integrating QML Code with Existing Qt UI Code}
+    \o \l{QML Signal and Handler Event System}{Signal and Handler Event System}
+    \o \l{Dynamic Object Management in QML}{Dynamic Object Management}
+    \o \l{Network Transparency}{Loading Resources in QML}
+    \o \l{QML Internationalization}{Internationalization}
+    \o \l{QML Graphical Effects}{Graphical Effects}
+    \endlist
+*/
+/*!
+    \group qml-architecture
+    \title QML Architecture
+
+    \brief QML Architecture
+
+    These are overviews of the architecture of QML and Qt Declarative Module.
+
+    \generatelist {related}
+*/