Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	src/controls/ToolBar.qml

Change-Id: I5510496219a4ebe8bfced4192307219238ca9bb6

1 files changed, 26 insertions, 1 deletions

diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml
index 5787e3c4..71dc9b26 100644
--- a/src/controls/TabView.qml
+++ b/src/controls/TabView.qml
@@ -49,8 +49,33 @@ import QtQuick.Controls.Private 1.0
     \ingroup views
     \brief A control that allows the user to select one of multiple stacked items.
 
-    You can create a custom appearance for a TabView by
+    \image tabview.png
+
+    TabView provides tab-based navigation model for your application.
+    For example, the following snippet uses tabs to present rectangles of
+    different color on each tab page:
+
+    \qml
+    TabView {
+        Tab {
+            title: "Red"
+            Rectangle { color: "red" }
+        }
+        Tab {
+            title: "Blue"
+            Rectangle { color: "blue" }
+        }
+        Tab {
+            title: "Green"
+            Rectangle { color: "green" }
+        }
+    }
+    \endqml
+
+    \note You can create a custom appearance for a TabView by
     assigning a \l {QtQuick.Controls.Styles::TabViewStyle}{TabViewStyle}.
+
+    \l Tab represents the content of a tab in a TabView.
 */
 
 FocusScope {