diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-25 03:02:56 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-25 03:02:56 (GMT) |
| commit | 84f405aa315dfec7c3d26d40a50185046d30164a (patch) | |
| tree | 44b1ab7198745b8ce74aa10c662f583701884fbf /src/declarative/graphicsitems/qmlgraphicswebview_p.h | |
| parent | 3509b9b5036a3c7d7512c7f0f3f98b2af4227fc2 (diff) | |
| download | Qt-84f405aa315dfec7c3d26d40a50185046d30164a.zip Qt-84f405aa315dfec7c3d26d40a50185046d30164a.tar.gz Qt-84f405aa315dfec7c3d26d40a50185046d30164a.tar.bz2 | |
Allow dragging be press and hold, in which case don't let Flickable take the drag.
When not press-and-hold, don't pass drags to WebKit.
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicswebview_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicswebview_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h index 17546c1..7ff51f3 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h @@ -89,7 +89,7 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsWebView : public QmlGraphicsPaintedItem { Q_OBJECT - Q_ENUMS(Status) + Q_ENUMS(Status SelectionMode) Q_PROPERTY(QString title READ title NOTIFY titleChanged) Q_PROPERTY(QPixmap icon READ icon NOTIFY iconChanged) @@ -220,6 +220,7 @@ protected: void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); void mouseMoveEvent(QGraphicsSceneMouseEvent *event); void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + void timerEvent(QTimerEvent *event); void hoverMoveEvent (QGraphicsSceneHoverEvent * event); void keyPressEvent(QKeyEvent* event); void keyReleaseEvent(QKeyEvent* event); |