summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsview_p.h
diff options
context:
space:
mode:
authorBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-07-01 09:25:57 (GMT)
committerBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-07-01 09:25:57 (GMT)
commit574fdf0b7e61c1c9994739035d9adb51af2629d0 (patch)
tree6cf91585a63b26dce56f18a1ccd924cf7ec38cb9 /src/gui/graphicsview/qgraphicsview_p.h
parenta1d5b33bd33ecf1d809346a39d2386cafaf50cef (diff)
parent9cb231d773db6deb8fb145eb40aa949a2758d002 (diff)
downloadQt-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/qgraphicsview_p.h')
-rw-r--r--src/gui/graphicsview/qgraphicsview_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsview_p.h b/src/gui/graphicsview/qgraphicsview_p.h
index d0c5e6e..7b9fd5e 100644
--- a/src/gui/graphicsview/qgraphicsview_p.h
+++ b/src/gui/graphicsview/qgraphicsview_p.h
@@ -174,6 +174,10 @@ public:
QList<QGraphicsItem *> findItems(const QRegion &exposedRegion, bool *allItems,
const QTransform &viewTransform) const;
+
+ QPointF mapToScene(const QPointF &point) const;
+ QRectF mapToScene(const QRectF &rect) const;
+ static void translateTouchEvent(QGraphicsViewPrivate *d, QTouchEvent *touchEvent);
};
QT_END_NAMESPACE