diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-12-08 16:55:42 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-12-08 16:55:42 (GMT) |
| commit | 33418800a5c78e06182bc0b41a2eabaf8aafc0fc (patch) | |
| tree | a5e30275f88c6f473b1e3d09f42c94799f7ac21e /src/gui/dialogs/dialogs.pri | |
| parent | 74b0c482b1edf606e1326c9053c612a7e514dee4 (diff) | |
| parent | 971acc6d34559a2c5035888a5891ea29ad8628af (diff) | |
| download | Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.zip Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.tar.gz Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/dialogs/dialogs.pri')
| -rw-r--r-- | src/gui/dialogs/dialogs.pri | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri index b9fad41..63f64a2 100644 --- a/src/gui/dialogs/dialogs.pri +++ b/src/gui/dialogs/dialogs.pri @@ -28,13 +28,27 @@ HEADERS += \ dialogs/qprintpreviewdialog.h !embedded:mac { - OBJECTIVE_SOURCES += dialogs/qcolordialog_mac.mm \ - dialogs/qfiledialog_mac.mm \ + OBJECTIVE_SOURCES += dialogs/qfiledialog_mac.mm \ dialogs/qfontdialog_mac.mm \ dialogs/qnspanelproxy_mac.mm \ dialogs/qpagesetupdialog_mac.mm \ dialogs/qprintdialog_mac.mm + +# Compile qcolordialog_mac.mm with exception support, disregarding the -no-exceptions +# configure option. (qcolordialog_mac needs to catch exceptions thrown by cocoa) + EXCEPTION_SOURCES = dialogs/qcolordialog_mac.mm + exceptions_compiler.commands = $$QMAKE_CXX -c + exceptions_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + exceptions_compiler.commands += -fexceptions + exceptions_compiler.dependency_type = TYPE_C + exceptions_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} + exceptions_compiler.input = EXCEPTION_SOURCES + exceptions_compiler.variable_out = OBJECTS + exceptions_compiler.name = compiling[exceptopns] ${QMAKE_FILE_IN} + silent:exceptions_compiler.commands = @echo compiling[exceptopns] ${QMAKE_FILE_IN} && $$exceptions_compiler.commands + QMAKE_EXTRA_COMPILERS += exceptions_compiler } + win32 { HEADERS += dialogs/qwizard_win_p.h SOURCES += dialogs/qdialogsbinarycompat_win.cpp \ |