summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2010-03-17 04:14:46 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2010-03-17 04:16:08 (GMT)
commit0830464f4a139234ba424b25590fc5d7bb5f4785 (patch)
tree2aa2b65b6a37841158942d98285044171588e7c3
parent36dcc2be63375da1f73d87565397fd11bf445bf8 (diff)
downloadQt-0830464f4a139234ba424b25590fc5d7bb5f4785.zip
Qt-0830464f4a139234ba424b25590fc5d7bb5f4785.tar.gz
Qt-0830464f4a139234ba424b25590fc5d7bb5f4785.tar.bz2
MouseArea works now with any QGraphicsObject
Easy, you just need to change the property. Reviewed-by:Martin Jones
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea.cpp4
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea_p.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index 13195af..26242bc 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -58,12 +58,12 @@ QDeclarativeDrag::~QDeclarativeDrag()
{
}
-QDeclarativeItem *QDeclarativeDrag::target() const
+QGraphicsObject *QDeclarativeDrag::target() const
{
return _target;
}
-void QDeclarativeDrag::setTarget(QDeclarativeItem *t)
+void QDeclarativeDrag::setTarget(QGraphicsObject *t)
{
if (_target == t)
return;
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
index 33422e2..db49b57 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
@@ -55,7 +55,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDrag : public QObject
Q_OBJECT
Q_ENUMS(Axis)
- Q_PROPERTY(QDeclarativeItem *target READ target WRITE setTarget NOTIFY targetChanged)
+ Q_PROPERTY(QGraphicsObject *target READ target WRITE setTarget NOTIFY targetChanged)
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)
@@ -67,8 +67,8 @@ public:
QDeclarativeDrag(QObject *parent=0);
~QDeclarativeDrag();
- QDeclarativeItem *target() const;
- void setTarget(QDeclarativeItem *);
+ QGraphicsObject *target() const;
+ void setTarget(QGraphicsObject *);
enum Axis { XAxis=0x01, YAxis=0x02, XandYAxis=0x03 };
Axis axis() const;
@@ -92,7 +92,7 @@ Q_SIGNALS:
void maximumYChanged();
private:
- QDeclarativeItem *_target;
+ QGraphicsObject *_target;
Axis _axis;
qreal _xmin;
qreal _xmax;