1 files changed, 31 insertions, 1 deletions
diff --git a/src/declarative/items/qsgmousearea_p.h b/src/declarative/items/qsgmousearea_p.h
index 469b9f7168..d7248bca37 100644
--- a/src/declarative/items/qsgmousearea_p.h
+++ b/src/declarative/items/qsgmousearea_p.h
@@ -51,12 +51,15 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+class QSGMouseEvent;
 class Q_AUTOTEST_EXPORT QSGDrag : public QObject
 {
     Q_OBJECT
 
     Q_ENUMS(Axis)
     Q_PROPERTY(QSGItem *target READ target WRITE setTarget NOTIFY targetChanged RESET resetTarget)
+    Q_PROPERTY(QSGItem *dropItem READ dropItem NOTIFY dropItemChanged)
+    Q_PROPERTY(QVariant data READ data WRITE setData NOTIFY dataChanged RESET resetData)
     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)
@@ -64,6 +67,7 @@ class Q_AUTOTEST_EXPORT QSGDrag : public QObject
     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(QStringList keys READ keys WRITE setKeys NOTIFY keysChanged)
     //### consider drag and drop
 
 public:
@@ -74,6 +78,16 @@ public:
     void setTarget(QSGItem *);
     void resetTarget();
 
+    QSGItem *dropItem() const;
+    void setDropItem(QSGItem *item);
+
+    QSGItem *grabItem() const;
+    void setGrabItem(QSGItem *grabItem);
+
+    QVariant data() const;
+    void setData(const QVariant &data);
+    void resetData();
+
     enum Axis { XAxis=0x01, YAxis=0x02, XandYAxis=0x03 };
     Axis axis() const;
     void setAxis(Axis);
@@ -93,8 +107,17 @@ public:
     bool filterChildren() const;
     void setFilterChildren(bool);
 
+    QStringList keys() const;
+    void setKeys(const QStringList &keys);
+
+    void emitDragged(QSGMouseEvent *event) { emit dragged(event); }
+    void emitDropped(QSGItem *dropItem) { emit dropped(dropItem); }
+    void emitCanceled() { emit canceled(); }
+
 Q_SIGNALS:
     void targetChanged();
+    void dropItemChanged();
+    void dataChanged();
     void axisChanged();
     void minimumXChanged();
     void maximumXChanged();
@@ -102,9 +125,17 @@ Q_SIGNALS:
     void maximumYChanged();
     void activeChanged();
     void filterChildrenChanged();
+    void keysChanged();
+    void dragged(QSGMouseEvent *mouse);
+    void dropped(QSGItem *dropItem);
+    void canceled();
 
 private:
+    QStringList _keys;
+    QVariant _data;
     QSGItem *_target;
+    QSGItem *_dropItem;
+    QSGItem *_grabItem;
     Axis _axis;
     qreal _xmin;
     qreal _xmax;
@@ -115,7 +146,6 @@ private:
     Q_DISABLE_COPY(QSGDrag)
 };
 
-class QSGMouseEvent;
 class QSGMouseAreaPrivate;
 class Q_AUTOTEST_EXPORT QSGMouseArea : public QSGItem
 {