diff options
| author | Alexis Menard <alexis.menard@trolltech.com> | 2011-06-22 15:00:09 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@trolltech.com> | 2011-06-22 15:00:09 (GMT) |
| commit | 1b46b28ddac18fd0f5edc250218dfb15ac05e652 (patch) | |
| tree | 57b0fe3414941d5deda54a7b658c7b3d2b0f2268 /src/declarative/graphicsitems/qdeclarativemousearea_p.h | |
| parent | 20ec7b41ac600fe670c3c8e6305cc12b10440c30 (diff) | |
| parent | e4cce8849bf45be9a111072e3fca7bdf67364e8a (diff) | |
| download | Qt-1b46b28ddac18fd0f5edc250218dfb15ac05e652.zip Qt-1b46b28ddac18fd0f5edc250218dfb15ac05e652.tar.gz Qt-1b46b28ddac18fd0f5edc250218dfb15ac05e652.tar.bz2 | |
Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativemousearea_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativemousearea_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p.h index 8fd453f..f6f970b 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea_p.h +++ b/src/declarative/graphicsitems/qdeclarativemousearea_p.h @@ -130,7 +130,6 @@ class Q_AUTOTEST_EXPORT QDeclarativeMouseArea : public QDeclarativeItem Q_PROPERTY(bool hoverEnabled READ hoverEnabled WRITE setHoverEnabled NOTIFY hoverEnabledChanged) Q_PROPERTY(QDeclarativeDrag *drag READ drag CONSTANT) //### add flicking to QDeclarativeDrag or add a QDeclarativeFlick ??? Q_PROPERTY(bool preventStealing READ preventStealing WRITE setPreventStealing NOTIFY preventStealingChanged REVISION 1) - Q_PROPERTY(QDeclarativeListProperty<QGraphicsObject> forwardTo READ forwardTo); public: QDeclarativeMouseArea(QDeclarativeItem *parent=0); @@ -158,8 +157,6 @@ public: bool preventStealing() const; void setPreventStealing(bool prevent); - QDeclarativeListProperty<QGraphicsObject> forwardTo(); - Q_SIGNALS: void hoveredChanged(); void pressedChanged(); |