diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-06-24 13:38:49 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-06-24 19:25:04 +0200 |
| commit | 72acc2eac69a5f58f8d99c25cb58f0afaebec7a4 (patch) | |
| tree | 357d5ee8cd241f0bd2943b55a780b075b9c00c5f /qmake/generators/win32/msvc_objectmodel.cpp | |
| parent | 73b5555277b2d5a6f752f44062b1a87e69abe756 (diff) | |
| download | qt4-tools-72acc2eac69a5f58f8d99c25cb58f0afaebec7a4.tar.gz | |
qmake: Fix CONFIG += exceptions_off with the MSVC project generator, take 2.
The previous patch caused the pch header to be compiled without exception
handling since the compilertool for the pch compilation do not get
its options filled from the compiler flags.
This patch instead set the value to off before calling parseOptions.
This also reverts commit 73fa311f67b21c9b897de0196d3b8227f27d828f.
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index e23e119815..1e060a005f 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -360,11 +360,8 @@ inline XmlOutput::xml_output xformUsePrecompiledHeaderForNET2005(pchOption whatP inline XmlOutput::xml_output xformExceptionHandlingNET2005(exceptionHandling eh, DotNET compilerVersion) { - if (eh == ehDefault) { - if (compilerVersion >= NET2005) - return attrE(_ExceptionHandling, ehNone); - return attrS(_ExceptionHandling, "false"); - } + if (eh == ehDefault) + return noxml(); if (compilerVersion >= NET2005) return attrE(_ExceptionHandling, eh); |