diff options
author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2009-12-01 13:54:40 (GMT) |
---|---|---|
committer | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2009-12-01 14:40:21 (GMT) |
commit | 271936b063fb261293e3f77f7a2273e3a4dbb5d6 (patch) | |
tree | 77880bbd72d981fc3afac1bb9f94c6bb530bb9e2 /src/gui/kernel | |
parent | b405b59dca7c3340ce424313c8e538dacbc2e824 (diff) | |
download | Qt-271936b063fb261293e3f77f7a2273e3a4dbb5d6.zip Qt-271936b063fb261293e3f77f7a2273e3a4dbb5d6.tar.gz Qt-271936b063fb261293e3f77f7a2273e3a4dbb5d6.tar.bz2 |
Creator crashes when reloading externally modified .ui files on Mac
On Mac QWidget::destroy() sends an AcceptDropsChange event after
clearing the guards for QPointer. This was used to store a QPointer to
the widget being deleted & that will never be cleared.
The fix removed the setAcceptDrops() from destroy. And as an extra
protection make sure designer will not treat that event as interesting.
Task-number: QTCREATORBUG-307
Reviewed-by: Denis Dzyubenko
Reviewed-by: Friedemann Kleint
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 0d9f9ee..1907cca 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -2617,8 +2617,6 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows) releaseMouse(); if(mac_keyboard_grabber == this) releaseKeyboard(); - if(acceptDrops()) - setAcceptDrops(false); if(testAttribute(Qt::WA_ShowModal)) // just be sure we leave modal QApplicationPrivate::leaveModal(this); |