diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-05-07 00:33:10 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-05-07 00:33:10 (GMT) |
| commit | 4b80c74334cbcb38b1a7f69681e654599f5c04d0 (patch) | |
| tree | bf694aa392d5b5851efaf2d1134fa5d736af2596 /src/gui/kernel/qwidget_mac.mm | |
| parent | 71601dfd3cf877e14796b7304f1bcc9e01248476 (diff) | |
| parent | 15e78b8487ee223eb44acf3d34e1cb71f76234ca (diff) | |
| download | Qt-4b80c74334cbcb38b1a7f69681e654599f5c04d0.zip Qt-4b80c74334cbcb38b1a7f69681e654599f5c04d0.tar.gz Qt-4b80c74334cbcb38b1a7f69681e654599f5c04d0.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qwidget_mac.mm')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 9da0b6b..1896b97 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -4491,8 +4491,8 @@ void QWidgetPrivate::registerDropSite(bool on) SetControlDragTrackingEnabled(qt_mac_nativeview_for(q), on); #else NSView *view = qt_mac_nativeview_for(q); - if ([view isKindOfClass:[QT_MANGLE_NAMESPACE(QCocoaView) class]]) { - [static_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(view) registerDragTypes:on]; + if (on && [view isKindOfClass:[QT_MANGLE_NAMESPACE(QCocoaView) class]]) { + [static_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(view) registerDragTypes]; } #endif } |