diff options
| author | Dyami Caliri <dyami@dragonframe.com> | 2014-05-22 08:27:09 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-22 21:44:01 +0200 |
| commit | 37fd82b9625db0aa90bb41f454956d3d84fa2573 (patch) | |
| tree | 6ebce237cf837620745801321dec50b9664be82d /src/printsupport | |
| parent | 3438fb961a38bb14292bdd7f10e2efd164cd9ab6 (diff) | |
QPrintDialog OSX: Fix qApp->processEvents arguments
The call to processEvents had the flags separated by a comma instead of
bitwise OR. This worked because processEvents has an optional second
argument that is an int.
Change-Id: I6dc74bc44b1d782aa7206f106c51c16eab5f2a76
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/printsupport/dialogs/qprintdialog_mac.mm b/src/printsupport/dialogs/qprintdialog_mac.mm index ef3e88be39..ba3837d497 100644 --- a/src/printsupport/dialogs/qprintdialog_mac.mm +++ b/src/printsupport/dialogs/qprintdialog_mac.mm @@ -239,7 +239,7 @@ void QPrintDialogPrivate::openCocoaPrintPanel(Qt::WindowModality modality) // Call processEvents in case the event dispatcher has been interrupted, and needs to do // cleanup of modal sessions. Do this before showing the native dialog, otherwise it will // close down during the cleanup (QTBUG-17913): - qApp->processEvents(QEventLoop::ExcludeUserInputEvents, QEventLoop::ExcludeSocketNotifiers); + qApp->processEvents(QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers); QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) *delegate = [[QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) alloc] initWithNSPrintInfo:printInfo]; if (modality == Qt::ApplicationModal || !q->parentWidget()) { |