diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-03-24 09:41:36 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-03-24 09:43:41 (GMT) |
| commit | cdb5729d8e1ffc4a00b52d6d4bbee34a9820a193 (patch) | |
| tree | 43f716864be12a3c09bdbf57edec949f7840a5e1 /src/gui/dialogs | |
| parent | ce80b75964ba5b1071112eb9bc04977da8079b23 (diff) | |
| download | Qt-cdb5729d8e1ffc4a00b52d6d4bbee34a9820a193.zip Qt-cdb5729d8e1ffc4a00b52d6d4bbee34a9820a193.tar.gz Qt-cdb5729d8e1ffc4a00b52d6d4bbee34a9820a193.tar.bz2 | |
Cocoa: respect QT_NO_EXCEPTION in color dialog
If the macro is set, we should not use cocoa exceptions either, as
this causes compile failures
Rev-By: jbache
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qcolordialog_mac.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/dialogs/qcolordialog_mac.mm b/src/gui/dialogs/qcolordialog_mac.mm index ee9b19a..9daf595 100644 --- a/src/gui/dialogs/qcolordialog_mac.mm +++ b/src/gui/dialogs/qcolordialog_mac.mm @@ -343,6 +343,7 @@ QT_USE_NAMESPACE mDialogIsExecuting = true; bool modalEnded = false; while (!modalEnded) { +#ifndef QT_NO_EXCEPTIONS @try { [NSApp runModalForWindow:mColorPanel]; modalEnded = true; @@ -351,6 +352,10 @@ QT_USE_NAMESPACE // clicking on 'SelectedMenuItemColor' from the 'Developer' // palette (tab three). } +#else + [NSApp runModalForWindow:mColorPanel]; + modalEnded = true; +#endif } QAbstractEventDispatcher::instance()->interrupt(); |