diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-01 09:25:57 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-01 09:25:57 (GMT) |
| commit | 574fdf0b7e61c1c9994739035d9adb51af2629d0 (patch) | |
| tree | 6cf91585a63b26dce56f18a1ccd924cf7ec38cb9 /src/gui/graphicsview/qgraphicsscene.h | |
| parent | a1d5b33bd33ecf1d809346a39d2386cafaf50cef (diff) | |
| parent | 9cb231d773db6deb8fb145eb40aa949a2758d002 (diff) | |
| download | Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.zip Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.tar.gz Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.tar.bz2 | |
Merge commit 'qt/master' into graphicssceneindex
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene_p.h
src/gui/graphicsview/qgraphicsview.cpp
src/gui/graphicsview/qgraphicsview_p.h
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h index 560671a..8329942 100644 --- a/src/gui/graphicsview/qgraphicsscene.h +++ b/src/gui/graphicsview/qgraphicsscene.h @@ -79,6 +79,7 @@ class QGraphicsSceneHelpEvent; class QGraphicsSceneHoverEvent; class QGraphicsSceneMouseEvent; class QGraphicsSceneWheelEvent; +class QGraphicsSceneGestureEvent; class QGraphicsSimpleTextItem; class QGraphicsTextItem; class QGraphicsView; @@ -206,7 +207,7 @@ public: inline QGraphicsRectItem *addRect(qreal x, qreal y, qreal w, qreal h, const QPen &pen = QPen(), const QBrush &brush = QBrush()) { return addRect(QRectF(x, y, w, h), pen, brush); } void removeItem(QGraphicsItem *item); - + QGraphicsItem *focusItem() const; void setFocusItem(QGraphicsItem *item, Qt::FocusReason focusReason = Qt::OtherFocusReason); bool hasFocus() const; |