diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-24 06:37:55 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-24 06:37:55 (GMT) |
| commit | dc904e1d9a110f8580cde4543a4c4b3813fa26e1 (patch) | |
| tree | 0ceea85a521044407868cc8afc937bafd548bbb3 /src/gui/kernel/qgesture.h | |
| parent | 3e301a89f613a2304392236085e593ad765d741a (diff) | |
| parent | 028655065de7f989a35b63bcab583767aba9c048 (diff) | |
| download | Qt-dc904e1d9a110f8580cde4543a4c4b3813fa26e1.zip Qt-dc904e1d9a110f8580cde4543a4c4b3813fa26e1.tar.gz Qt-dc904e1d9a110f8580cde4543a4c4b3813fa26e1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfsfileengine_unix.cpp
Diffstat (limited to 'src/gui/kernel/qgesture.h')
| -rw-r--r-- | src/gui/kernel/qgesture.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h index ee28ea4..1d2fa6d 100644 --- a/src/gui/kernel/qgesture.h +++ b/src/gui/kernel/qgesture.h @@ -63,20 +63,24 @@ class Q_GUI_EXPORT QGesture : public QObject Q_DECLARE_PRIVATE(QGesture) Q_PROPERTY(Qt::GestureState state READ state) + Q_PROPERTY(QObject* gestureTarget READ gestureTarget WRITE setGestureTarget) public: - explicit QGesture(QObject *parent = 0); + explicit QGesture(QObject *gestureTarget = 0, QObject *parent = 0); ~QGesture(); virtual bool filterEvent(QEvent *event) = 0; + void setGestureTarget(QObject *object); + QObject* gestureTarget() const; + void setGraphicsItem(QGraphicsItem *); QGraphicsItem *graphicsItem() const; Qt::GestureState state() const; protected: - QGesture(QGesturePrivate &dd, QObject *parent); + QGesture(QGesturePrivate &dd, QObject *gestureTarget, QObject *parent); bool eventFilter(QObject*, QEvent*); virtual void reset(); |