diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 11:47:24 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:52:15 +0200 |
| commit | 8e6ecb56e5d61ce661422779c9d9cbf22f081a34 (patch) | |
| tree | 227aeb360800a49de58472bd39bc5f4c596c1b15 /src/declarative/items/qsgcanvas_p.h | |
| parent | c9224b6cf5cceb7d5314f7504d44bfe72bc66950 (diff) | |
| parent | 0d84e957297b4ffa6ab5b0b5bcf8b169d567d298 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgitem.cpp
src/declarative/items/qsgtextnode.cpp
tests/auto/declarative/examples/examples.pro
tools/qmlviewer/qmlviewer.pro
Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
Diffstat (limited to 'src/declarative/items/qsgcanvas_p.h')
| -rw-r--r-- | src/declarative/items/qsgcanvas_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/items/qsgcanvas_p.h b/src/declarative/items/qsgcanvas_p.h index e16d91685d..bf65e95812 100644 --- a/src/declarative/items/qsgcanvas_p.h +++ b/src/declarative/items/qsgcanvas_p.h @@ -119,11 +119,11 @@ public: bool deliverHoverEvent(QSGItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, bool &accepted); bool sendHoverEvent(QEvent::Type, QSGItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, bool accepted); - void clearHover(); + bool clearHover(); void deliverDragEvent(QSGDragEvent *); bool deliverDragEvent(QSGItem *item, QSGDragEvent *); - QDeclarativeGuard<QSGItem> hoverItem; + QList<QSGItem*> hoverItems; enum FocusOption { DontChangeFocusProperty = 0x01, }; |