From cdb5729d8e1ffc4a00b52d6d4bbee34a9820a193 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Thu, 24 Mar 2011 10:41:36 +0100
Subject: 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
---
 src/gui/dialogs/qcolordialog_mac.mm | 5 +++++
 1 file changed, 5 insertions(+)

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();
-- 
cgit v0.12