diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-12-09 13:23:47 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-12-09 13:23:47 (GMT) |
| commit | 5c8afa87bcb975681b42529456335583df314ff5 (patch) | |
| tree | 8960be5a0f3147a30c96151fe5af8d651e95343a /src/gui/dialogs | |
| parent | eea71824f57dd61b0a513e3bbb5ced99de505d73 (diff) | |
| parent | bc4077223affd542f5fb24e27a065b7999229654 (diff) | |
| download | Qt-5c8afa87bcb975681b42529456335583df314ff5.zip Qt-5c8afa87bcb975681b42529456335583df314ff5.tar.gz Qt-5c8afa87bcb975681b42529456335583df314ff5.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6-upstream
Diffstat (limited to 'src/gui/dialogs')
| -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 \ |