diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-05-06 23:56:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-05-06 23:56:32 (GMT) |
| commit | 1ae95bbda437d6b4829cc3979b40ceffc5eb2ff2 (patch) | |
| tree | 2b42dee7e29da05ee3c185dae653bdb90b1d834a /src/gui/kernel/qwidget_mac.mm | |
| parent | 627f9b09896a1933dd55e1157a06bdec84c7d70c (diff) | |
| parent | 15e78b8487ee223eb44acf3d34e1cb71f76234ca (diff) | |
| download | Qt-1ae95bbda437d6b4829cc3979b40ceffc5eb2ff2.zip Qt-1ae95bbda437d6b4829cc3979b40ceffc5eb2ff2.tar.gz Qt-1ae95bbda437d6b4829cc3979b40ceffc5eb2ff2.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 } |