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

Conflicts:
	.qmake.conf
	examples/quickcontrols2/quickcontrols2.pro

Change-Id: If2f5e40487ba6515ba322f92380573727bdd6bc0

4 files changed, 9 insertions, 3 deletions

diff --git a/src/imports/controls/doc/doc.pri b/src/imports/controls/doc/doc.pri
index 8eaccbed..f39405e7 100644
--- a/src/imports/controls/doc/doc.pri
+++ b/src/imports/controls/doc/doc.pri
@@ -2,6 +2,7 @@ QMAKE_DOCS = $$PWD/qtquickcontrols2.qdocconf
 
 OTHER_FILES += \
     $$files($$PWD/snippets/*.qml) \
+    $$files($$PWD/snippets/screenshots/*.qml) \
     $$files($$PWD/src/*.qdoc) \
     $$files($$PWD/src/calendar/*.qdoc) \
     $$files($$PWD/src/templates/*.qdoc)
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 3f37a73b..ca98c432 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -754,7 +754,7 @@ void QQuickDial::wheelEvent(QWheelEvent *event)
     if (d->wheelEnabled) {
         const qreal oldValue = d->value;
         const QPointF angle = event->angleDelta();
-        const qreal delta = (qFuzzyIsNull(angle.y()) ? angle.x() : angle.y()) / QWheelEvent::DefaultDeltasPerStep;
+        const qreal delta = (qFuzzyIsNull(angle.y()) ? angle.x() : (event->inverted() ? -angle.y() : angle.y())) / QWheelEvent::DefaultDeltasPerStep;
         const qreal step = qFuzzyIsNull(d->stepSize) ? 0.1 : d->stepSize;
         setValue(oldValue + step * delta);
         event->setAccepted(!qFuzzyCompare(d->value, oldValue));
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index ab5415d3..74239cf2 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
@@ -461,8 +461,13 @@ void QQuickMenu::componentComplete()
 void QQuickMenu::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
 {
     Q_D(QQuickMenu);
-    Q_UNUSED(oldItem);
     QQuickPopup::contentItemChange(newItem, oldItem);
+
+    if (oldItem)
+        QQuickItemPrivate::get(oldItem)->removeItemChangeListener(d, QQuickItemPrivate::Children);
+    if (newItem)
+        QQuickItemPrivate::get(newItem)->addItemChangeListener(d, QQuickItemPrivate::Children);
+
     d->contentItem = newItem;
 }
 
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index 2398b1e1..47282c65 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -710,7 +710,7 @@ void QQuickSlider::wheelEvent(QWheelEvent *event)
     if (d->wheelEnabled) {
         const qreal oldValue = d->value;
         const QPointF angle = event->angleDelta();
-        const qreal delta = (qFuzzyIsNull(angle.y()) ? angle.x() : angle.y()) / QWheelEvent::DefaultDeltasPerStep;
+        const qreal delta = (qFuzzyIsNull(angle.y()) ? angle.x() : (event->inverted() ? -angle.y() : angle.y())) / QWheelEvent::DefaultDeltasPerStep;
         const qreal step = qFuzzyIsNull(d->stepSize) ? 0.1 : d->stepSize;
         setValue(oldValue + step * delta);
         const bool wasMoved = !qFuzzyCompare(d->value, oldValue);