diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 16:08:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 16:08:32 (GMT) |
| commit | 91e5c91cde03d36cf85e31de1f66d6552e621ccd (patch) | |
| tree | a638ad415e5ead612cc96f729e4ce89c5f718a91 /src/corelib | |
| parent | d28057dc6f282c2cc129eae40a4fb1555fef455c (diff) | |
| parent | da4d5207f0a97d7e4fcc32e43a6a6e959c8f293a (diff) | |
| download | Qt-91e5c91cde03d36cf85e31de1f66d6552e621ccd.zip Qt-91e5c91cde03d36cf85e31de1f66d6552e621ccd.tar.gz Qt-91e5c91cde03d36cf85e31de1f66d6552e621ccd.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Make sure QGraphicsSceneHoverLeave event has non-null widget pointer.
Designer: Enable morphing into QTextBrowser.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 9d3513a..4c91aaf 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -328,6 +328,7 @@ private: friend class QETWidget; friend class QGraphicsView; friend class QGraphicsViewPrivate; + friend class QGraphicsScene; friend class QGraphicsScenePrivate; #ifndef QT_NO_GESTURES friend class QGestureManager; |