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

Conflicts:
	src/controls/ToolBar.qml

Change-Id: I5510496219a4ebe8bfced4192307219238ca9bb6

1 files changed, 8 insertions, 0 deletions

diff --git a/src/controls/Calendar.qml b/src/controls/Calendar.qml
index bd376c10..9dd96ed3 100644
--- a/src/controls/Calendar.qml
+++ b/src/controls/Calendar.qml
@@ -50,6 +50,8 @@ import QtQuick.Controls.Private 1.0
     \ingroup controls
     \brief Provides a way to select dates from a calendar
 
+    \image calendar.png
+
     Calendar allows selection of dates from a grid of days, similar to
     QCalendarWidget.
 
@@ -67,6 +69,12 @@ import QtQuick.Controls.Private 1.0
     Week numbers can be displayed by setting the weekNumbersVisible property to
     \c true.
 
+    \qml
+    Calendar{
+        weekNumbersVisible: true
+    }
+    \endqml
+
     You can create a custom appearance for Calendar by assigning a
     \l {QtQuick.Controls.Styles::CalendarStyle}{CalendarStyle}.
 */