diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-13 00:28:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-13 08:28:27 +0200 |
| commit | ae745746a666134d9e9258b8c2ff00540624d835 (patch) | |
| tree | 8294fffa3d752d61f79004fb04e21e927472fd8f /src/quick/items/qquickdrag.cpp | |
| parent | a7b383ab989e74ef552c2ef9c38377e065f1ab0e (diff) | |
| parent | 531d00c1909527cb1bc28f17197267ccde408b0c (diff) | |
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
Diffstat (limited to 'src/quick/items/qquickdrag.cpp')
| -rw-r--r-- | src/quick/items/qquickdrag.cpp | 13 |
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 |