Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af

29 files changed, 10 insertions, 9 deletions

diff --git a/examples/quick/controls/texteditor/qml/images/qt-logo.png b/examples/quick/controls/texteditor/qml/images/qt-logo.png
index 6dedc8bf0..be1bb1060 100644
--- a/examples/quick/controls/texteditor/qml/images/qt-logo.png
+++ b/examples/quick/controls/texteditor/qml/images/qt-logo.png
diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp
index 9ce73dbc8..bdecf5ba1 100644
--- a/examples/quick/controls/texteditor/src/documenthandler.cpp
+++ b/examples/quick/controls/texteditor/src/documenthandler.cpp
@@ -143,7 +143,6 @@ void DocumentHandler::saveAs(const QUrl &arg, const QString &fileType)
     }
     f.write((isHtml ? m_doc->toHtml() : m_doc->toPlainText()).toLocal8Bit());
     f.close();
-    qDebug() << "saved to" << localPath;
     setFileUrl(QUrl::fromLocalFile(localPath));
 }
 
diff --git a/examples/quick/extras/dashboard/images/fuel-icon.png b/examples/quick/extras/dashboard/images/fuel-icon.png
index f521e9052..70da758c2 100644
--- a/examples/quick/extras/dashboard/images/fuel-icon.png
+++ b/examples/quick/extras/dashboard/images/fuel-icon.png
diff --git a/examples/quick/extras/gallery/images/center.png b/examples/quick/extras/gallery/images/center.png
index b18a5fa87..fd3696404 100644
--- a/examples/quick/extras/gallery/images/center.png
+++ b/examples/quick/extras/gallery/images/center.png
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml
index 9e4f97e75..4841eacee 100644
--- a/src/controls/Private/ScrollViewHelper.qml
+++ b/src/controls/Private/ScrollViewHelper.qml
@@ -73,10 +73,10 @@ Item {
     function doLayout() {
         if (!recursionGuard) {
             recursionGuard = true
-            scrollHelper.availableWidth = viewport.width
-            scrollHelper.availableHeight = viewport.height
             scrollHelper.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0
             scrollHelper.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0
+            scrollHelper.availableWidth = viewport.width
+            scrollHelper.availableHeight = viewport.height
             recursionGuard = false
         }
     }
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml
index ea9972093..999649b0c 100644
--- a/src/controls/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -180,9 +180,7 @@ Control {
         \since QtQuick.Controls 1.1
 
         This signal is emitted when the Return or Enter key is pressed or
-        the control loses focus. Note that if there is a validator
-        set on the control and enter/return is pressed, this signal will
-        only be emitted if the validator returns an acceptable state.
+        the control loses focus.
 
         The corresponding handler is \c onEditingFinished.
     */
diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml
index 8e4102c7c..085fa56e4 100644
--- a/src/controls/Styles/Base/SliderStyle.qml
+++ b/src/controls/Styles/Base/SliderStyle.qml
@@ -162,9 +162,12 @@ Style {
         }
     }
 
-    /*! This property holds the tick mark labels
+    /*! This property holds the tick mark labels.
         \since QtQuick.Controls.Styles 1.1
 
+        Every tickmark that should be drawn must be defined within this
+        component, so it is common to use a \l Repeater, for example.
+
         You can access the handle width through the \c styleData.handleWidth property.
     */
     property Component tickmarks: Repeater {
diff --git a/src/controls/doc/images/applicationwindow.png b/src/controls/doc/images/applicationwindow.png
index 90111f724..478cdda50 100644
--- a/src/controls/doc/images/applicationwindow.png
+++ b/src/controls/doc/images/applicationwindow.png
diff --git a/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png b/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png
index b8e1faab3..0c54d62b2 100644
--- a/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png
+++ b/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png
diff --git a/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png b/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png
index 94619bae3..cfea77719 100644
--- a/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png
+++ b/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png
diff --git a/src/controls/doc/images/qtquickcontrols-example-text.png b/src/controls/doc/images/qtquickcontrols-example-text.png
index 36aab4d50..94813412b 100644
--- a/src/controls/doc/images/qtquickcontrols-example-text.png
+++ b/src/controls/doc/images/qtquickcontrols-example-text.png
diff --git a/src/controls/doc/images/qtquickcontrols-example-touch.png b/src/controls/doc/images/qtquickcontrols-example-touch.png
index e33455bc1..d4f26589d 100644
--- a/src/controls/doc/images/qtquickcontrols-example-touch.png
+++ b/src/controls/doc/images/qtquickcontrols-example-touch.png
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp
index aa316c9f5..ddb25790c 100644
--- a/src/controls/qquickmenu.cpp
+++ b/src/controls/qquickmenu.cpp
@@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE
     as children. It also supports \l Instantiator objects as long as the insertion is
     being done manually using \l insertItem().
 
-    \code
+    \qml
     Menu {
         id: recentFilesMenu
 
@@ -97,7 +97,8 @@ QT_BEGIN_NAMESPACE
             enabled: recentFilesModel.count > 0
             onTriggered: recentFilesModel.clear()
         }
-    \endcode
+    }
+    \endqml
 
     Note that in this case, the \c index parameter passed to \l insertItem() is relative
     to the position of the \l Instantiator in the menu, as opposed to absolute position
diff --git a/src/dialogs/images/checkers.png b/src/dialogs/images/checkers.png
index 458d33de9..72cb9f035 100644
--- a/src/dialogs/images/checkers.png
+++ b/src/dialogs/images/checkers.png
diff --git a/src/dialogs/images/window_border.png b/src/dialogs/images/window_border.png
index 431af8545..23c011d0f 100644
--- a/src/dialogs/images/window_border.png
+++ b/src/dialogs/images/window_border.png
diff --git a/src/extras/doc/images/circulargauge.png b/src/extras/doc/images/circulargauge.png
index f88aa01f5..b3957fe0f 100644
--- a/src/extras/doc/images/circulargauge.png
+++ b/src/extras/doc/images/circulargauge.png
diff --git a/src/extras/doc/images/delaybutton-activated.png b/src/extras/doc/images/delaybutton-activated.png
index d78d77382..ddb48ba0e 100644
--- a/src/extras/doc/images/delaybutton-activated.png
+++ b/src/extras/doc/images/delaybutton-activated.png
diff --git a/src/extras/doc/images/delaybutton-progress.png b/src/extras/doc/images/delaybutton-progress.png
index 07a13256f..211af3df2 100644
--- a/src/extras/doc/images/delaybutton-progress.png
+++ b/src/extras/doc/images/delaybutton-progress.png
diff --git a/src/extras/doc/images/delaybutton.png b/src/extras/doc/images/delaybutton.png
index 510abc0bf..39d243dce 100644
--- a/src/extras/doc/images/delaybutton.png
+++ b/src/extras/doc/images/delaybutton.png
diff --git a/src/extras/doc/images/dial.png b/src/extras/doc/images/dial.png
index d0e4d5ace..248b60bc4 100644
--- a/src/extras/doc/images/dial.png
+++ b/src/extras/doc/images/dial.png
diff --git a/src/extras/doc/images/piemenu.png b/src/extras/doc/images/piemenu.png
index 95078eae6..442e341c2 100644
--- a/src/extras/doc/images/piemenu.png
+++ b/src/extras/doc/images/piemenu.png
diff --git a/src/extras/doc/images/statusindicator-active.png b/src/extras/doc/images/statusindicator-active.png
index c5ebc09dd..4bd7864f2 100644
--- a/src/extras/doc/images/statusindicator-active.png
+++ b/src/extras/doc/images/statusindicator-active.png
diff --git a/src/extras/doc/images/statusindicator-green.png b/src/extras/doc/images/statusindicator-green.png
index 88dcb1ed2..a9fbceb8e 100644
--- a/src/extras/doc/images/statusindicator-green.png
+++ b/src/extras/doc/images/statusindicator-green.png
diff --git a/src/extras/doc/images/statusindicator-inactive.png b/src/extras/doc/images/statusindicator-inactive.png
index 27488d5ee..e5205979e 100644
--- a/src/extras/doc/images/statusindicator-inactive.png
+++ b/src/extras/doc/images/statusindicator-inactive.png
diff --git a/src/extras/doc/images/togglebutton-checked.png b/src/extras/doc/images/togglebutton-checked.png
index d40b382b8..0891d4935 100644
--- a/src/extras/doc/images/togglebutton-checked.png
+++ b/src/extras/doc/images/togglebutton-checked.png
diff --git a/src/extras/doc/images/togglebutton-unchecked.png b/src/extras/doc/images/togglebutton-unchecked.png
index 7db5b84ba..ee27c038d 100644
--- a/src/extras/doc/images/togglebutton-unchecked.png
+++ b/src/extras/doc/images/togglebutton-unchecked.png
diff --git a/tests/auto/activeFocusOnTab/data/images/testIcon.png b/tests/auto/activeFocusOnTab/data/images/testIcon.png
index 7ac5f840b..82e429dd9 100644
--- a/tests/auto/activeFocusOnTab/data/images/testIcon.png
+++ b/tests/auto/activeFocusOnTab/data/images/testIcon.png
diff --git a/tests/manual/images/checkered.png b/tests/manual/images/checkered.png
index 12c8b54b1..c34d52604 100644
--- a/tests/manual/images/checkered.png
+++ b/tests/manual/images/checkered.png
diff --git a/tests/manual/images/testIcon.png b/tests/manual/images/testIcon.png
index 7ac5f840b..82e429dd9 100644
--- a/tests/manual/images/testIcon.png
+++ b/tests/manual/images/testIcon.png