diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 13:36:29 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:10:58 +0100 |
commit | 3b512ae142017f105f297467f74dc28d3cb9030a (patch) | |
tree | 9e131e23c01537f051851a1da9576c1e1ddf5ba2 /src/printsupport/dialogs | |
parent | e20c4730192f312881591fb50e571af0a88fe421 (diff) | |
parent | f956f9a83603a3df5651e3238c24e8df37558d6e (diff) |
Merge master into api_changes
Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
Diffstat (limited to 'src/printsupport/dialogs')
-rw-r--r-- | src/printsupport/dialogs/qprintdialog_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
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]; } } |