diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-26 09:41:06 +0200 |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-26 09:41:06 +0200 |
| commit | 12ebfedc3de64e99082ca573351bdd24b1d42370 (patch) | |
| tree | 0290b22723ae07fb4b11e6f5008e5bae2050a12b /src/gui/graphicsview/qgraphicsproxywidget.cpp | |
| parent | 7ffe42d376b574239480b38b8f6430339b806daa (diff) | |
| parent | baec0ecd314c6e9563bd56cf19571ca71d7d11cd (diff) | |
| download | qt4-tools-12ebfedc3de64e99082ca573351bdd24b1d42370.tar.gz | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/kernel/qcoreevent.h
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'src/gui/graphicsview/qgraphicsproxywidget.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsproxywidget.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp index 564106852c..8f11d6f006 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget.cpp +++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp @@ -990,6 +990,7 @@ void QGraphicsProxyWidget::contextMenuEvent(QGraphicsSceneContextMenuEvent *even } #endif // QT_NO_CONTEXTMENU +#ifndef QT_NO_DRAGANDDROP /*! \reimp */ @@ -1110,6 +1111,7 @@ void QGraphicsProxyWidget::dropEvent(QGraphicsSceneDragDropEvent *event) } #endif } +#endif /*! \reimp |