Remove deprecated PinchHandler.m{in,ax}imum{X,Y} for Qt 6

Change-Id: Id941d7dc6b6ce9207db09cf4790f4401515dbda5
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

2 files changed, 0 insertions, 69 deletions

diff --git a/src/quick/handlers/qquickpinchhandler.cpp b/src/quick/handlers/qquickpinchhandler.cpp
index 5b30d08557..8413b8b721 100644
--- a/src/quick/handlers/qquickpinchhandler.cpp
+++ b/src/quick/handlers/qquickpinchhandler.cpp
@@ -153,49 +153,6 @@ void QQuickPinchHandler::setMaximumRotation(qreal maximumRotation)
     emit maximumRotationChanged();
 }
 
-#if QT_DEPRECATED_SINCE(5, 12)
-void QQuickPinchHandler::warnAboutMinMaxDeprecated() const
-{
-    qmlWarning(this) << "min and max constraints are now part of the xAxis and yAxis properties";
-}
-
-void QQuickPinchHandler::setMinimumX(qreal minX)
-{
-    warnAboutMinMaxDeprecated();
-    if (qFuzzyCompare(m_minimumX, minX))
-        return;
-    m_minimumX = minX;
-    emit minimumXChanged();
-}
-
-void QQuickPinchHandler::setMaximumX(qreal maxX)
-{
-    warnAboutMinMaxDeprecated();
-    if (qFuzzyCompare(m_maximumX, maxX))
-        return;
-    m_maximumX = maxX;
-    emit maximumXChanged();
-}
-
-void QQuickPinchHandler::setMinimumY(qreal minY)
-{
-    warnAboutMinMaxDeprecated();
-    if (qFuzzyCompare(m_minimumY, minY))
-        return;
-    m_minimumY = minY;
-    emit minimumYChanged();
-}
-
-void QQuickPinchHandler::setMaximumY(qreal maxY)
-{
-    warnAboutMinMaxDeprecated();
-    if (qFuzzyCompare(m_maximumY, maxY))
-        return;
-    m_maximumY = maxY;
-    emit maximumYChanged();
-}
-#endif
-
 bool QQuickPinchHandler::wantsPointerEvent(QQuickPointerEvent *event)
 {
     if (!QQuickMultiPointHandler::wantsPointerEvent(event))
diff --git a/src/quick/handlers/qquickpinchhandler_p.h b/src/quick/handlers/qquickpinchhandler_p.h
index a8f5c121ba..b4e9fa0336 100644
--- a/src/quick/handlers/qquickpinchhandler_p.h
+++ b/src/quick/handlers/qquickpinchhandler_p.h
@@ -70,12 +70,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPinchHandler : public QQuickMultiPointHandler
     Q_PROPERTY(qreal activeScale READ activeScale NOTIFY updated)
     Q_PROPERTY(qreal rotation READ rotation NOTIFY updated)
     Q_PROPERTY(QVector2D translation READ translation NOTIFY updated)
-#if QT_DEPRECATED_SINCE(5, 12)
-    Q_PROPERTY(qreal minimumX READ minimumX WRITE setMinimumX NOTIFY minimumXChanged)   // ### Qt 6: remove
-    Q_PROPERTY(qreal maximumX READ maximumX WRITE setMaximumX NOTIFY maximumXChanged)   // ### Qt 6: remove
-    Q_PROPERTY(qreal minimumY READ minimumY WRITE setMinimumY NOTIFY minimumYChanged)   // ### Qt 6: remove
-    Q_PROPERTY(qreal maximumY READ maximumY WRITE setMaximumY NOTIFY maximumYChanged)   // ### Qt 6: remove
-#endif
     Q_PROPERTY(QQuickDragAxis * xAxis READ xAxis CONSTANT)
     Q_PROPERTY(QQuickDragAxis * yAxis READ yAxis CONSTANT)
     QML_NAMED_ELEMENT(PinchHandler)
@@ -101,18 +95,6 @@ public:
     qreal activeScale() const { return m_activeScale; }
     qreal rotation() const { return m_activeRotation; }
 
-#if QT_DEPRECATED_SINCE(5, 12)
-    void warnAboutMinMaxDeprecated() const;
-    qreal minimumX() const { warnAboutMinMaxDeprecated(); return m_minimumX; }
-    void setMinimumX(qreal minX);
-    qreal maximumX() const { warnAboutMinMaxDeprecated(); return m_maximumX; }
-    void setMaximumX(qreal maxX);
-    qreal minimumY() const { warnAboutMinMaxDeprecated(); return m_minimumY; }
-    void setMinimumY(qreal minY);
-    qreal maximumY() const { warnAboutMinMaxDeprecated(); return m_maximumY; }
-    void setMaximumY(qreal maxY);
-#endif
-
     QQuickDragAxis *xAxis() { return &m_xAxis; }
     QQuickDragAxis *yAxis() { return &m_yAxis; }
 
@@ -121,10 +103,6 @@ signals:
     void maximumScaleChanged();
     void minimumRotationChanged();
     void maximumRotationChanged();
-    void minimumXChanged();
-    void maximumXChanged();
-    void minimumYChanged();
-    void maximumYChanged();
     void updated();
 
 protected:
@@ -145,10 +123,6 @@ private:
     qreal m_minimumRotation = -qInf();
     qreal m_maximumRotation = qInf();
 
-    qreal m_minimumX = -qInf();
-    qreal m_maximumX = qInf();
-    qreal m_minimumY = -qInf();
-    qreal m_maximumY = qInf();
     QQuickDragAxis m_xAxis;
     QQuickDragAxis m_yAxis;