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

Conflicts:
	src/imports/templates/qtquicktemplates2plugin.cpp

Change-Id: I4a07d331163a85a0fb98a5f58f3970863f8da0fc

1 files changed, 14 insertions, 2 deletions

diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index 9aeec74f..6050149e 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
@@ -196,9 +196,18 @@ void QQuickScrollBarPrivate::setInteractive(bool enabled)
         return;
 
     interactive = enabled;
-    q->setAcceptedMouseButtons(interactive ? Qt::LeftButton : Qt::NoButton);
-    if (!interactive)
+    if (interactive) {
+        q->setAcceptedMouseButtons(Qt::LeftButton);
+#if QT_CONFIG(cursor)
+        q->setCursor(Qt::ArrowCursor);
+#endif
+    } else {
+        q->setAcceptedMouseButtons(Qt::NoButton);
+#if QT_CONFIG(cursor)
+        q->unsetCursor();
+#endif
         q->ungrabMouse();
+    }
     emit q->interactiveChanged();
 }
 
@@ -274,6 +283,9 @@ QQuickScrollBar::QQuickScrollBar(QQuickItem *parent)
 {
     setKeepMouseGrab(true);
     setAcceptedMouseButtons(Qt::LeftButton);
+#if QT_CONFIG(cursor)
+    setCursor(Qt::ArrowCursor);
+#endif
 }
 
 QQuickScrollBarAttached *QQuickScrollBar::qmlAttachedProperties(QObject *object)