diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-25 07:55:55 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-25 07:55:55 (GMT) |
| commit | acc6122892a33b845da32b1d5b30dc6852c17e73 (patch) | |
| tree | 978a84a77a6bccff08bace60d47a6b14cd9eefd2 /src/gui/graphicsview/qgraphicsproxywidget.h | |
| parent | 43eccd4e52402b9020a0cf26aa1486784f8abe0e (diff) | |
| parent | 4147a2c788c39f09ef87181768a779cb701fd2bd (diff) | |
| download | Qt-acc6122892a33b845da32b1d5b30dc6852c17e73.zip Qt-acc6122892a33b845da32b1d5b30dc6852c17e73.tar.gz Qt-acc6122892a33b845da32b1d5b30dc6852c17e73.tar.bz2 | |
Merge branch 'master' into graphics-master
Diffstat (limited to 'src/gui/graphicsview/qgraphicsproxywidget.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsproxywidget.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.h b/src/gui/graphicsview/qgraphicsproxywidget.h index b2c3c8f..ab8c9da 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget.h +++ b/src/gui/graphicsview/qgraphicsproxywidget.h @@ -90,10 +90,12 @@ protected: void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); #endif +#ifndef QT_NO_DRAGANDDROP void dragEnterEvent(QGraphicsSceneDragDropEvent *event); void dragLeaveEvent(QGraphicsSceneDragDropEvent *event); void dragMoveEvent(QGraphicsSceneDragDropEvent *event); void dropEvent(QGraphicsSceneDragDropEvent *event); +#endif void hoverEnterEvent(QGraphicsSceneHoverEvent *event); void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); |