diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-17 13:22:03 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-17 13:22:03 (GMT) |
| commit | faf6d0de6e3b8168fbd6f04c5380f47d350e2a22 (patch) | |
| tree | d3c35778ad9c7abe68b681b39dd004027fd50880 /src/gui/kernel/qwidget_mac.mm | |
| parent | 3a92f40e1faf4d81f5071a66558b051a9fda727e (diff) | |
| parent | 499a9aaabad0756cbca7b39751684308a6ba88ea (diff) | |
| download | Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.zip Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.tar.gz Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'src/gui/kernel/qwidget_mac.mm')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 75f9a59..71f0077 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -2673,7 +2673,10 @@ void QWidgetPrivate::transferChildren() // site disabled until it is part of the new hierarchy. bool oldRegistered = w->testAttribute(Qt::WA_DropSiteRegistered); w->setAttribute(Qt::WA_DropSiteRegistered, false); + [qt_mac_nativeview_for(w) retain]; + [qt_mac_nativeview_for(w) removeFromSuperview]; [qt_mac_nativeview_for(q) addSubview:qt_mac_nativeview_for(w)]; + [qt_mac_nativeview_for(w) release]; w->setAttribute(Qt::WA_DropSiteRegistered, oldRegistered); #endif } |