From 83a6435595a141ed72e3bc84e8b86f6d5d592aaa Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Tue, 20 Mar 2012 09:18:30 +0100 Subject: Cocoa: fix crash when using QPrintDialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The contextInfo passed to printPanelDidEnd should be a QPrintDialog*, not a QPrintDialogPrivate*. Change-Id: I8f9aae2f27b483b4669f9d39cdafd0ddeb37fd22 Reviewed-by: Morten Johan Sørvig --- src/printsupport/dialogs/qprintdialog_mac.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/printsupport/dialogs/qprintdialog_mac.mm') diff --git a/src/printsupport/dialogs/qprintdialog_mac.mm b/src/printsupport/dialogs/qprintdialog_mac.mm index 417ae20f29..ecd1ef60cd 100644 --- a/src/printsupport/dialogs/qprintdialog_mac.mm +++ b/src/printsupport/dialogs/qprintdialog_mac.mm @@ -206,7 +206,7 @@ void QPrintDialogPrivate::openCocoaPrintPanel(Qt::WindowModality modality) QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) *delegate = [[QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) alloc] init]; if (modality == Qt::ApplicationModal) { int rval = [printPanel runModalWithPrintInfo:printInfo]; - [delegate printPanelDidEnd:printPanel returnCode:rval contextInfo:this]; + [delegate printPanelDidEnd:printPanel returnCode:rval contextInfo:q]; } else { Q_ASSERT(q->parentWidget()); QWindow *parentWindow = q->parentWidget()->windowHandle(); @@ -215,7 +215,7 @@ void QPrintDialogPrivate::openCocoaPrintPanel(Qt::WindowModality modality) modalForWindow:window delegate:delegate didEndSelector:@selector(printPanelDidEnd:returnCode:contextInfo:) - contextInfo:this]; + contextInfo:q]; } } -- cgit v1.2.3