aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickswipedelegate.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-11-06 20:32:26 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-11-06 20:32:26 +0100
commit501d45012f746d843e0144c78202297a577758bc (patch)
tree5c2b125327d49e3495b5f47995d93fb4215acbb4 /src/quicktemplates2/qquickswipedelegate.cpp
parent9e1b044afa994cdd77fd256cea78cd144e804d76 (diff)
parent442843db6f5dce6b594448d43b380c9b884a7c91 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: src/quickcontrols2/qquickchecklabel.cpp src/quickcontrols2/qquickchecklabel_p.h src/quickcontrols2/qquickmnemoniclabel_p.h src/quicktemplates2/qquickbuttongroup_p.h src/quicktemplates2/qquickspinbox.cpp src/quicktemplates2/qquickswipedelegate.cpp Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
Diffstat (limited to 'src/quicktemplates2/qquickswipedelegate.cpp')
-rw-r--r--src/quicktemplates2/qquickswipedelegate.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp
index 628f5d47..dcf93437 100644
--- a/src/quicktemplates2/qquickswipedelegate.cpp
+++ b/src/quicktemplates2/qquickswipedelegate.cpp
@@ -737,7 +737,6 @@ bool QQuickSwipeDelegatePrivate::handleMousePressEvent(QQuickItem *item, QMouseE
// so we correct it after calling the base class' mousePressEvent(), rather
// than having to duplicate its code just so we can set the pressPoint.
setPressPoint(item->mapToItem(q, event->pos()));
- q->grabMouse();
return true;
}
@@ -754,7 +753,6 @@ bool QQuickSwipeDelegatePrivate::handleMousePressEvent(QQuickItem *item, QMouseE
attached->setPressed(true);
// Stop the event from propagating, as QQuickItem explicitly ignores events.
event->accept();
- item->grabMouse();
return true;
}