diff options
Diffstat (limited to 'src/quick/items/qquickdrag_p.h')
| -rw-r--r-- | src/quick/items/qquickdrag_p.h | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h index 806dbc7602..fa73e91485 100644 --- a/src/quick/items/qquickdrag_p.h +++ b/src/quick/items/qquickdrag_p.h @@ -119,24 +119,23 @@ private: friend class QQuickDragAttachedPrivate; }; -class QQmlV4Function; class QQuickDragAttached; -class Q_QUICK_PRIVATE_EXPORT QQuickDrag : public QObject +class Q_QUICK_EXPORT QQuickDrag : public QObject { Q_OBJECT - Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged RESET resetTarget) - Q_PROPERTY(Axis axis READ axis WRITE setAxis NOTIFY axisChanged) - Q_PROPERTY(qreal minimumX READ xmin WRITE setXmin NOTIFY minimumXChanged) - Q_PROPERTY(qreal maximumX READ xmax WRITE setXmax NOTIFY maximumXChanged) - Q_PROPERTY(qreal minimumY READ ymin WRITE setYmin NOTIFY minimumYChanged) - Q_PROPERTY(qreal maximumY READ ymax WRITE setYmax NOTIFY maximumYChanged) - Q_PROPERTY(bool active READ active NOTIFY activeChanged) - Q_PROPERTY(bool filterChildren READ filterChildren WRITE setFilterChildren NOTIFY filterChildrenChanged) - Q_PROPERTY(bool smoothed READ smoothed WRITE setSmoothed NOTIFY smoothedChanged) + Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged RESET resetTarget FINAL) + Q_PROPERTY(Axis axis READ axis WRITE setAxis NOTIFY axisChanged FINAL FINAL) + Q_PROPERTY(qreal minimumX READ xmin WRITE setXmin NOTIFY minimumXChanged FINAL) + Q_PROPERTY(qreal maximumX READ xmax WRITE setXmax NOTIFY maximumXChanged FINAL) + Q_PROPERTY(qreal minimumY READ ymin WRITE setYmin NOTIFY minimumYChanged FINAL) + Q_PROPERTY(qreal maximumY READ ymax WRITE setYmax NOTIFY maximumYChanged FINAL) + Q_PROPERTY(bool active READ active NOTIFY activeChanged FINAL) + Q_PROPERTY(bool filterChildren READ filterChildren WRITE setFilterChildren NOTIFY filterChildrenChanged FINAL) + Q_PROPERTY(bool smoothed READ smoothed WRITE setSmoothed NOTIFY smoothedChanged FINAL) // Note, threshold was added in QtQuick 2.2 but REVISION is not supported (or needed) for grouped // properties See QTBUG-33179 - Q_PROPERTY(qreal threshold READ threshold WRITE setThreshold NOTIFY thresholdChanged RESET resetThreshold) + Q_PROPERTY(qreal threshold READ threshold WRITE setThreshold NOTIFY thresholdChanged RESET resetThreshold FINAL) //### consider drag and drop QML_NAMED_ELEMENT(Drag) @@ -211,21 +210,23 @@ private: }; class QQuickDragAttachedPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickDragAttached : public QObject +class Q_QUICK_EXPORT QQuickDragAttached : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QQuickDragAttached) - Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) - Q_PROPERTY(QObject *source READ source WRITE setSource NOTIFY sourceChanged RESET resetSource) - Q_PROPERTY(QObject *target READ target NOTIFY targetChanged) - Q_PROPERTY(QPointF hotSpot READ hotSpot WRITE setHotSpot NOTIFY hotSpotChanged) - Q_PROPERTY(QUrl imageSource READ imageSource WRITE setImageSource NOTIFY imageSourceChanged) - Q_PROPERTY(QStringList keys READ keys WRITE setKeys NOTIFY keysChanged) - Q_PROPERTY(QVariantMap mimeData READ mimeData WRITE setMimeData NOTIFY mimeDataChanged) - Q_PROPERTY(Qt::DropActions supportedActions READ supportedActions WRITE setSupportedActions NOTIFY supportedActionsChanged) - Q_PROPERTY(Qt::DropAction proposedAction READ proposedAction WRITE setProposedAction NOTIFY proposedActionChanged) - Q_PROPERTY(QQuickDrag::DragType dragType READ dragType WRITE setDragType NOTIFY dragTypeChanged) + Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged FINAL) + Q_PROPERTY(QObject *source READ source WRITE setSource NOTIFY sourceChanged RESET resetSource FINAL) + Q_PROPERTY(QObject *target READ target NOTIFY targetChanged FINAL) + Q_PROPERTY(QPointF hotSpot READ hotSpot WRITE setHotSpot NOTIFY hotSpotChanged FINAL) + Q_PROPERTY(QUrl imageSource READ imageSource WRITE setImageSource NOTIFY imageSourceChanged FINAL) + // imageSourceSize is new in Qt 6.8; revision omitted because of QTBUG-33179 + Q_PROPERTY(QSize imageSourceSize READ imageSourceSize WRITE setImageSourceSize NOTIFY imageSourceSizeChanged FINAL) + Q_PROPERTY(QStringList keys READ keys WRITE setKeys NOTIFY keysChanged FINAL) + Q_PROPERTY(QVariantMap mimeData READ mimeData WRITE setMimeData NOTIFY mimeDataChanged FINAL) + Q_PROPERTY(Qt::DropActions supportedActions READ supportedActions WRITE setSupportedActions NOTIFY supportedActionsChanged FINAL) + Q_PROPERTY(Qt::DropAction proposedAction READ proposedAction WRITE setProposedAction NOTIFY proposedActionChanged FINAL) + Q_PROPERTY(QQuickDrag::DragType dragType READ dragType WRITE setDragType NOTIFY dragTypeChanged FINAL) QML_ANONYMOUS QML_ADDED_IN_VERSION(2, 0) @@ -249,6 +250,9 @@ public: QUrl imageSource() const; void setImageSource(const QUrl &url); + QSize imageSourceSize() const; + void setImageSourceSize(const QSize &size); + QStringList keys() const; void setKeys(const QStringList &keys); @@ -269,8 +273,8 @@ public: bool event(QEvent *event) override; public Q_SLOTS: - void start(QQmlV4Function *); - void startDrag(QQmlV4Function *); + void start(QQmlV4FunctionPtr); + void startDrag(QQmlV4FunctionPtr); void cancel(); Q_SIGNALS: @@ -282,6 +286,7 @@ Q_SIGNALS: void targetChanged(); void hotSpotChanged(); void imageSourceChanged(); + void imageSourceSizeChanged(); // new in Qt 6.8 void keysChanged(); void mimeDataChanged(); void supportedActionsChanged(); @@ -291,6 +296,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickDrag) - #endif |