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

Conflicts:
	src/quick/items/qquickimagebase.cpp
	src/imports/layouts/plugin.cpp

Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21

1 files changed, 1 insertions, 1 deletions

diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 4aa54b71df..126737418a 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -311,7 +311,7 @@ void QQuickDragAttached::setActive(bool active)
             else if (d->dragType == QQuickDrag::Automatic) {
                 // There are different semantics than start() since startDrag()
                 // may be called after an internal drag is already started.
-                active = true;
+                d->active = true;
                 emit activeChanged();
                 d->startDrag(d->supportedActions);
             }