diff options
Diffstat (limited to 'src/quick/handlers/qquickpinchhandler_p.h')
-rw-r--r-- | src/quick/handlers/qquickpinchhandler_p.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/quick/handlers/qquickpinchhandler_p.h b/src/quick/handlers/qquickpinchhandler_p.h index d86b96c932..114ae9642a 100644 --- a/src/quick/handlers/qquickpinchhandler_p.h +++ b/src/quick/handlers/qquickpinchhandler_p.h @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -class Q_QUICK_PRIVATE_EXPORT QQuickPinchHandler : public QQuickMultiPointHandler +class Q_QUICK_EXPORT QQuickPinchHandler : public QQuickMultiPointHandler { Q_OBJECT @@ -103,17 +103,15 @@ Q_SIGNALS: void minimumRotationChanged(); void maximumRotationChanged(); void updated(); - Q_REVISION(6, 5) void scaleChanged(qreal delta); - Q_REVISION(6, 5) void rotationChanged(qreal delta); - Q_REVISION(6, 5) void translationChanged(QVector2D delta); + void scaleChanged(qreal delta); + void rotationChanged(qreal delta); + void translationChanged(QVector2D delta); protected: bool wantsPointerEvent(QPointerEvent *event) override; void onActiveChanged() override; void handlePointerEventImpl(QPointerEvent *event) override; - QPointF startPos(); - private: QQuickDragAxis m_xAxis = {this, u"x"_s}; QQuickDragAxis m_yAxis = {this, u"y"_s}; @@ -123,6 +121,7 @@ private: // internal qreal m_startDistance = 0; qreal m_accumulatedStartCentroidDistance = 0; + QPointF m_startTargetPos; QVector<PointData> m_startAngles; QQuickMatrix4x4 m_transform; }; |