diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-08 01:00:31 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-08 01:00:31 +0200 |
commit | 38e97c68ba25c29a6fbdd3f79d56fd52a0f58a4c (patch) | |
tree | 10bba7efed661c45e62c89c07f8b0f01d9bf6701 /src/quick/handlers | |
parent | 67fc5b677a05f88f043ea825810b7b244a516b42 (diff) | |
parent | e5f3e7149b7e130c375c1419f1f804dfeaf578aa (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib381f350ada365747ce20b989bfdc368d75f2219
Diffstat (limited to 'src/quick/handlers')
-rw-r--r-- | src/quick/handlers/qquickmultipointhandler.cpp | 2 | ||||
-rw-r--r-- | src/quick/handlers/qquickmultipointhandler_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/handlers/qquickmultipointhandler.cpp b/src/quick/handlers/qquickmultipointhandler.cpp index 0afc9997aa..f404788de4 100644 --- a/src/quick/handlers/qquickmultipointhandler.cpp +++ b/src/quick/handlers/qquickmultipointhandler.cpp @@ -364,7 +364,7 @@ void QQuickMultiPointHandler::acceptPoints(const QVector<QQuickEventPoint *> &po point->setAccepted(); } -bool QQuickMultiPointHandler::grabPoints(QVector<QQuickEventPoint *> points) +bool QQuickMultiPointHandler::grabPoints(const QVector<QQuickEventPoint *> &points) { if (points.isEmpty()) return false; diff --git a/src/quick/handlers/qquickmultipointhandler_p.h b/src/quick/handlers/qquickmultipointhandler_p.h index eeb4b13b83..480f69035b 100644 --- a/src/quick/handlers/qquickmultipointhandler_p.h +++ b/src/quick/handlers/qquickmultipointhandler_p.h @@ -107,7 +107,7 @@ protected: QVector<PointData> angles(const QPointF &ref) const; static qreal averageAngleDelta(const QVector<PointData> &old, const QVector<PointData> &newAngles); void acceptPoints(const QVector<QQuickEventPoint *> &points); - bool grabPoints(QVector<QQuickEventPoint *> points); + bool grabPoints(const QVector<QQuickEventPoint *> &points); void moveTarget(QPointF pos); Q_DECLARE_PRIVATE(QQuickMultiPointHandler) |