Merge branch '4.7' of scm.dev.nokia.troll.no:qt/jpasions-qt-doc-team-qtquick into 4.7

Conflicts:
	doc/src/declarative/extending.qdoc
	doc/src/external-resources.qdoc
	doc/src/overviews.qdoc
	src/declarative/util/qdeclarativeview.cpp

1 files changed, 24 insertions, 26 deletions

diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 2e49a7f..73900c4 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -164,32 +164,30 @@
 
     \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
+These are overviews of the many features of the QML language and \l{Qt Quick}.
+
+\list
+\o \l{QML Basic Elements}{Basic Elements}
+\o \l{QML Basic Types}{Data Types}
+\o \l{Property Binding}
+\o \l{Using QML Positioner and Repeater Items}{Component Layouts}
+\o \l{Anchor-based Layout in QML}{Layouts using Anchors}
+\o \l{QML Mouse Events}{Mouse Events}
+\o \l{QML Text Handling and Validators}{Text Handling and Validators}
+\o \l{Keyboard Focus in QML}{Keyboard Focus}
+\o \l{QML Signal and Handler Event System}{Signal and Handler Event System}
+\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{Dynamic Object Management in QML}{Dynamic Object Management}
+\o \l{Network Transparency}{Loading Resources in QML}
+\o \l{QML Internationalization}{Internationalization}
+\endlist
 */
 /*!
     \group qml-architecture