1 files changed, 77 insertions, 11 deletions

diff --git a/src/quickshapes/qquickshape_p.h b/src/quickshapes/qquickshape_p.h
index f1e2eea546..30be74b775 100644
--- a/src/quickshapes/qquickshape_p.h
+++ b/src/quickshapes/qquickshape_p.h
@@ -27,15 +27,15 @@ QT_BEGIN_NAMESPACE
 class QQuickShapePathPrivate;
 class QQuickShapePrivate;
 
-void Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapes_initializeModule();
+void Q_QUICKSHAPES_EXPORT QQuickShapes_initializeModule();
 
-class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapesModule
+class Q_QUICKSHAPES_EXPORT QQuickShapesModule
 {
 public:
     static void defineModule();
 };
 
-class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapeGradient : public QQuickGradient
+class Q_QUICKSHAPES_EXPORT QQuickShapeGradient : public QQuickGradient
 {
     Q_OBJECT
     Q_PROPERTY(SpreadMode spread READ spread WRITE setSpread NOTIFY spreadChanged)
@@ -65,7 +65,7 @@ private:
     SpreadMode m_spread;
 };
 
-class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapeLinearGradient : public QQuickShapeGradient
+class Q_QUICKSHAPES_EXPORT QQuickShapeLinearGradient : public QQuickShapeGradient
 {
     Q_OBJECT
     Q_PROPERTY(qreal x1 READ x1 WRITE setX1 NOTIFY x1Changed)
@@ -99,7 +99,7 @@ private:
     QPointF m_end;
 };
 
-class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapeRadialGradient : public QQuickShapeGradient
+class Q_QUICKSHAPES_EXPORT QQuickShapeRadialGradient : public QQuickShapeGradient
 {
     Q_OBJECT
     Q_PROPERTY(qreal centerX READ centerX WRITE setCenterX NOTIFY centerXChanged)
@@ -148,7 +148,7 @@ private:
     qreal m_focalRadius = 0;
 };
 
-class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapeConicalGradient : public QQuickShapeGradient
+class Q_QUICKSHAPES_EXPORT QQuickShapeConicalGradient : public QQuickShapeGradient
 {
     Q_OBJECT
     Q_PROPERTY(qreal centerX READ centerX WRITE setCenterX NOTIFY centerXChanged)
@@ -180,7 +180,7 @@ private:
     qreal m_angle = 0;
 };
 
-class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapePath : public QQuickPath
+class Q_QUICKSHAPES_EXPORT QQuickShapePath : public QQuickPath
 {
     Q_OBJECT
 
@@ -196,6 +196,8 @@ class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapePath : public QQuickPath
     Q_PROPERTY(QVector<qreal> dashPattern READ dashPattern WRITE setDashPattern NOTIFY dashPatternChanged)
     Q_PROPERTY(QQuickShapeGradient *fillGradient READ fillGradient WRITE setFillGradient RESET resetFillGradient)
     Q_PROPERTY(QSizeF scale READ scale WRITE setScale NOTIFY scaleChanged REVISION(1, 14))
+    Q_PROPERTY(PathHints pathHints READ pathHints WRITE setPathHints NOTIFY pathHintsChanged REVISION(6, 7) FINAL)
+    Q_PROPERTY(QMatrix4x4 fillTransform READ fillTransform WRITE setFillTransform NOTIFY fillTransformChanged REVISION(6, 8) FINAL)
     QML_NAMED_ELEMENT(ShapePath)
     QML_ADDED_IN_VERSION(1, 0)
 
@@ -226,6 +228,18 @@ public:
     };
     Q_ENUM(StrokeStyle)
 
+    enum PathHint {
+        PathLinear = 0x1,
+        PathQuadratic = 0x2,
+        PathConvex = 0x4,
+        PathFillOnRight = 0x8,
+        PathSolid = 0x10,
+        PathNonIntersecting = 0x20,
+        PathNonOverlappingControlPointTriangles = 0x40
+    };
+    Q_DECLARE_FLAGS(PathHints, PathHint)
+    Q_FLAG(PathHints)
+
     QQuickShapePath(QObject *parent = nullptr);
     ~QQuickShapePath();
 
@@ -263,6 +277,12 @@ public:
     void setFillGradient(QQuickShapeGradient *gradient);
     void resetFillGradient();
 
+    PathHints pathHints() const;
+    void setPathHints(PathHints newPathHints);
+
+    QMatrix4x4 fillTransform() const;
+    void setFillTransform(const QMatrix4x4 &matrix);
+
 Q_SIGNALS:
     void shapePathChanged();
     void strokeColorChanged();
@@ -276,20 +296,30 @@ Q_SIGNALS:
     void dashOffsetChanged();
     void dashPatternChanged();
 
+    Q_REVISION(6, 7) void pathHintsChanged();
+    Q_REVISION(6, 8) void fillTransformChanged();
+
 private:
     Q_DISABLE_COPY(QQuickShapePath)
     Q_DECLARE_PRIVATE(QQuickShapePath)
     Q_PRIVATE_SLOT(d_func(), void _q_fillGradientChanged())
 };
 
-class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShape : public QQuickItem
+class Q_QUICKSHAPES_EXPORT QQuickShape : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(RendererType rendererType READ rendererType NOTIFY rendererChanged)
     Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged)
     Q_PROPERTY(bool vendorExtensionsEnabled READ vendorExtensionsEnabled WRITE setVendorExtensionsEnabled NOTIFY vendorExtensionsEnabledChanged)
+    Q_PROPERTY(RendererType preferredRendererType READ preferredRendererType
+               WRITE setPreferredRendererType NOTIFY preferredRendererTypeChanged REVISION(6, 6) FINAL)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(ContainsMode containsMode READ containsMode WRITE setContainsMode NOTIFY containsModeChanged REVISION(1, 11))
+    Q_PROPERTY(QRectF boundingRect READ boundingRect NOTIFY boundingRectChanged REVISION(6, 6) FINAL)
+    Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged REVISION(6, 7) FINAL)
+    Q_PROPERTY(HAlignment horizontalAlignment READ horizontalAlignment WRITE setHorizontalAlignment NOTIFY horizontalAlignmentChanged REVISION(6, 7) FINAL)
+    Q_PROPERTY(VAlignment verticalAlignment READ verticalAlignment WRITE setVerticalAlignment NOTIFY verticalAlignmentChanged REVISION(6, 7) FINAL)
+
     Q_PROPERTY(QQmlListProperty<QObject> data READ data)
     Q_CLASSINFO("DefaultProperty", "data")
     QML_NAMED_ELEMENT(Shape)
@@ -300,7 +330,8 @@ public:
         UnknownRenderer,
         GeometryRenderer,
         NvprRenderer,
-        SoftwareRenderer
+        SoftwareRenderer,
+        CurveRenderer
     };
     Q_ENUM(RendererType)
 
@@ -317,6 +348,23 @@ public:
     };
     Q_ENUM(ContainsMode)
 
+    enum FillMode {
+        NoResize,
+        PreserveAspectFit,
+        PreserveAspectCrop,
+        Stretch
+    };
+    Q_ENUM(FillMode)
+
+    enum HAlignment { AlignLeft = Qt::AlignLeft,
+                      AlignRight = Qt::AlignRight,
+                      AlignHCenter = Qt::AlignHCenter };
+    Q_ENUM(HAlignment)
+    enum VAlignment { AlignTop = Qt::AlignTop,
+                      AlignBottom = Qt::AlignBottom,
+                      AlignVCenter = Qt::AlignVCenter };
+    Q_ENUM(VAlignment)
+
     QQuickShape(QQuickItem *parent = nullptr);
     ~QQuickShape();
 
@@ -325,6 +373,11 @@ public:
     bool asynchronous() const;
     void setAsynchronous(bool async);
 
+    Q_REVISION(6, 6) RendererType preferredRendererType() const;
+    Q_REVISION(6, 6) void setPreferredRendererType(RendererType preferredType);
+
+    Q_REVISION(6, 6) QRectF boundingRect() const override;
+
     bool vendorExtensionsEnabled() const;
     void setVendorExtensionsEnabled(bool enable);
 
@@ -337,6 +390,15 @@ public:
 
     QQmlListProperty<QObject> data();
 
+    Q_REVISION(6, 7) FillMode fillMode() const;
+    Q_REVISION(6, 7) void setFillMode(FillMode newFillMode);
+
+    Q_REVISION(6, 7) HAlignment horizontalAlignment() const;
+    Q_REVISION(6, 7) void setHorizontalAlignment(HAlignment newHorizontalAlignment);
+
+    Q_REVISION(6, 7) VAlignment verticalAlignment() const;
+    Q_REVISION(6, 7) void setVerticalAlignment(VAlignment newVerticalAlignment);
+
 protected:
     QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *) override;
     void updatePolish() override;
@@ -349,8 +411,14 @@ Q_SIGNALS:
     void asynchronousChanged();
     void vendorExtensionsEnabledChanged();
     void statusChanged();
+    Q_REVISION(6, 6) void preferredRendererTypeChanged();
+    Q_REVISION(6, 6) void boundingRectChanged();
     Q_REVISION(1, 11) void containsModeChanged();
 
+    Q_REVISION(6, 7) void fillModeChanged();
+    Q_REVISION(6, 7) void horizontalAlignmentChanged();
+    Q_REVISION(6, 7) void verticalAlignmentChanged();
+
 private:
     Q_DISABLE_COPY(QQuickShape)
     Q_DECLARE_PRIVATE(QQuickShape)
@@ -359,6 +427,4 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickShape)
-
 #endif // QQUICKSHAPE_P_H