Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I316bcbbc5308fda27728df15db1e780aa073da2a

10 files changed, 50 insertions, 14 deletions

diff --git a/LICENSE.GPLv2 b/LICENSE.GPLv2
index 6dbb032f..a4244777 100644
--- a/LICENSE.GPLv2
+++ b/LICENSE.GPLv2
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU General Public License version 2, which is displayed below.
 
 -------------------------------------------------------------------------
diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3
index 4e49b122..71c4ad49 100644
--- a/LICENSE.GPLv3
+++ b/LICENSE.GPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3. That license references
  the General Public License version 3, that is displayed below. Other
  portions of the Qt Toolkit may be licensed directly under this license.
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index 4d67bac0..6bf924cd 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3, which is displayed below.
  This license makes reference to the version 3 of the GNU General
  Public License, which you can find in the LICENSE.GPLv3 file.
diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1
new file mode 100644
index 00000000..44a12bd2
--- /dev/null
+++ b/dist/changes-5.6.1
@@ -0,0 +1,30 @@
+Qt 5.6.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  https://doc.qt.io/qt-5/
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Dialogs                                         *
+****************************************************************************
+
+ - [QTBUG-49058] Proper resize and default size for content.
+
+****************************************************************************
+*                          Controls                                        *
+****************************************************************************
+
+ - Fixed a memory leak in QStyleOption.
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml
index 4841eace..066bc6cd 100644
--- a/src/controls/Private/ScrollViewHelper.qml
+++ b/src/controls/Private/ScrollViewHelper.qml
@@ -73,10 +73,12 @@ Item {
     function doLayout() {
         if (!recursionGuard) {
             recursionGuard = true
+            blockUpdates = true;
             scrollHelper.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0
             scrollHelper.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0
             scrollHelper.availableWidth = viewport.width
             scrollHelper.availableHeight = viewport.height
+            blockUpdates = false;
             recursionGuard = false
         }
     }
diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc
index 749efc32..70c8eabb 100644
--- a/src/controls/doc/src/qtquickcontrols-examples.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc
@@ -83,16 +83,16 @@
 
     In all forms, items that are supposed to interact with the application logic are exported:
 
-    \qml
+    \code
     property alias cancel: cancel
     property alias save: save
     property alias textArea: textArea
-    \endqml
+    \endcode
 
     This is the way the items are exported in \e NotesForm.ui.qml, so they can be used in
     \e Notes.ui.qml to implement the logic as follows:
 
-    \qml
+    \code
     function readData() {
         CustomerModel.selection.forEach(function (rowIndex) {
             form.textArea.text = CustomerModel.model.get(rowIndex).notes
@@ -113,7 +113,7 @@
 
     cancel.onClicked: readData()
     save.onClicked: writeData()
-    \endqml
+    \endcode
 
     \section1 Implementing the Backend in a Singleton
 
diff --git a/src/controls/doc/src/qtquickcontrols-tableview.qdoc b/src/controls/doc/src/qtquickcontrols-tableview.qdoc
index 98c7ca7b..cf86174a 100644
--- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc
@@ -288,12 +288,12 @@
 */
 
 /*!
-    \qmlpropertygroup TableView::section
+    \qmlpropertygroup QtQuick.Controls::TableView::section
     \qmlproperty string TableView::section.property
     \qmlproperty enumeration TableView::section.criteria
     \qmlproperty Component TableView::section.delegate
     \qmlproperty enumeration TableView::section.labelPositioning
 
     These properties determine the section labels.
-    \sa ListView::section
+    \sa {QtQuick::ListView::section}{ListView.section}
 */
diff --git a/src/controls/doc/src/qtquickcontrols-treeview.qdoc b/src/controls/doc/src/qtquickcontrols-treeview.qdoc
index 4fe92d9c..438eec7a 100644
--- a/src/controls/doc/src/qtquickcontrols-treeview.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-treeview.qdoc
@@ -125,14 +125,15 @@
 */
 
 /*!
-    \qmlpropertygroup TreeView::section
+    \qmlpropertygroup QtQuick.Controls::TreeView::section
     \qmlproperty string TreeView::section.property
     \qmlproperty enumeration TreeView::section.criteria
     \qmlproperty Component TreeView::section.delegate
     \qmlproperty enumeration TreeView::section.labelPositioning
 
     These properties determine the section labels.
-    \sa ListView::section
+
+    \sa {QtQuick::ListView::section}{ListView.section}
 */
 
 /*!
diff --git a/src/extras/designer/PictureSpecifics.qml b/src/extras/designer/PictureSpecifics.qml
index a4c197fd..461e233a 100644
--- a/src/extras/designer/PictureSpecifics.qml
+++ b/src/extras/designer/PictureSpecifics.qml
@@ -55,7 +55,7 @@ Column {
         SectionLayout {
             Label {
                 text: qsTr("Source")
-                toolTip: qsTr("Source")
+                tooltip: qsTr("Source")
             }
             SecondColumnLayout {
                 LineEdit {
diff --git a/tests/auto/controls/data/tst_calendar.qml b/tests/auto/controls/data/tst_calendar.qml
index fe227ab7..b8677b0a 100644
--- a/tests/auto/controls/data/tst_calendar.qml
+++ b/tests/auto/controls/data/tst_calendar.qml
@@ -941,14 +941,17 @@ Item {
             asyncCalendar.parent = container;
             waitForRendering(asyncCalendar);
 
+            tryCompare(testcase.aysncDelegatesConstructed, "length", CalendarUtils.daysInAWeek);
+
             for (var i = 0; i < testcase.aysncDelegatesConstructed.length; ++i) {
-                tryCompare(testcase.aysncDelegatesConstructed, i, true);
+                compare(testcase.aysncDelegatesConstructed[i], true);
             }
 
             asyncCalendarLoader.active = false;
+            tryCompare(testcase.aysncDelegatesDestructed, "length", CalendarUtils.daysInAWeek);
 
             for (i = 0; i < testcase.aysncDelegatesDestructed.length; ++i) {
-                tryCompare(testcase.aysncDelegatesDestructed, i, true);
+                compare(testcase.aysncDelegatesDestructed[i], true);
             }
         }
     }