summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-28 08:44:07 (GMT)
committerTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-28 08:47:05 (GMT)
commit165dbe2615bf4b908e6bc84bb8963ca72fe5f866 (patch)
tree5f3d9d176ad8f79f5359b24c27c6ee86df975ed8 /src/gui/dialogs
parent3551479ebb7a6c32805eb7cd52b0ac3d11461b56 (diff)
downloadQt-165dbe2615bf4b908e6bc84bb8963ca72fe5f866.zip
Qt-165dbe2615bf4b908e6bc84bb8963ca72fe5f866.tar.gz
Qt-165dbe2615bf4b908e6bc84bb8963ca72fe5f866.tar.bz2
Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.
The Qt::WA_DeleteOnClose bug was fixed some time ago, while this workaround was "forgotten" in the QPrintDialog code. It actually causes a crash and is no longer necessary. Task-number: QTBUG-11430 Reviewed-by: Prasanth
Diffstat (limited to 'src/gui/dialogs')
-rw-r--r--src/gui/dialogs/qprintdialog_mac.mm9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/dialogs/qprintdialog_mac.mm b/src/gui/dialogs/qprintdialog_mac.mm
index 84a72db..82e4db5 100644
--- a/src/gui/dialogs/qprintdialog_mac.mm
+++ b/src/gui/dialogs/qprintdialog_mac.mm
@@ -140,11 +140,6 @@ QT_USE_NAMESPACE
QPrintDialogPrivate *d = static_cast<QPrintDialogPrivate *>(contextInfo);
QPrintDialog *dialog = d->printDialog();
- // temporary hack to work around bug in deleteLater() in Qt/Mac Cocoa
-#if 1
- bool deleteDialog = dialog->testAttribute(Qt::WA_DeleteOnClose);
- dialog->setAttribute(Qt::WA_DeleteOnClose, false);
-#endif
if (returnCode == NSOKButton) {
UInt32 frompage, topage;
@@ -192,10 +187,6 @@ QT_USE_NAMESPACE
}
dialog->done((returnCode == NSOKButton) ? QDialog::Accepted : QDialog::Rejected);
-#if 1
- if (deleteDialog)
- delete dialog;
-#endif
}
@end