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

Conflicts:
	src/qml/jsapi/qjsengine.cpp
	src/qml/qml/qqmlengine_p.h
	src/quick/items/qquickanchors.cpp
	src/quick/items/qquickanimatedimage_p_p.h
	src/quick/items/qquickitem_p.h
	tests/auto/qml/qqmlecmascript/testtypes.h
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
	tests/benchmarks/qml/creation/tst_creation.cpp

Change-Id: I65861e32f16e8a04c7090a90231627e1ebf6ba6f

1 files changed, 7 insertions, 6 deletions

diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 76e13bc985..cc30199253 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -310,13 +310,14 @@ void QQuickDragAttached::setActive(bool active)
         else if (active) {
             if (d->dragType == QQuickDrag::Internal) {
                 d->start(d->supportedActions);
-            }
-            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;
+            } else {
+                d->active = true;
                 emit activeChanged();
-                d->startDrag(d->supportedActions);
+                if (d->dragType == QQuickDrag::Automatic) {
+                    // There are different semantics than start() since startDrag()
+                    // may be called after an internal drag is already started.
+                    d->startDrag(d->supportedActions);
+                }
             }
         }
         else