diff options
| author | Iain <qt-info@nokia.com> | 2009-09-11 09:19:23 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-09-11 09:19:23 (GMT) |
| commit | 3d4a2cd013f9e62788adf902a57ae8e2f31fccc7 (patch) | |
| tree | 7fb5b2428730de6473e9dcaf02b31ac5178e7e76 /src/s60main | |
| parent | 486ff054b8b65c191df39748dfe59f9440a60578 (diff) | |
| download | Qt-3d4a2cd013f9e62788adf902a57ae8e2f31fccc7.zip Qt-3d4a2cd013f9e62788adf902a57ae8e2f31fccc7.tar.gz Qt-3d4a2cd013f9e62788adf902a57ae8e2f31fccc7.tar.bz2 | |
Fix compile errors (missing uncaught_exception definition) on Symbian^3
When using STDCPP in Symbian^3, the definition for uncaught_exception
*must* be provided before any attempt to include e32base.h is made.
This is because STDCPP support disables the standard Symbian definition
of uncaught_exception, so the version from <exception> needs to be used
instead.
Reviewed-by: Jason Barron
Diffstat (limited to 'src/s60main')
| -rw-r--r-- | src/s60main/qts60main.cpp | 1 | ||||
| -rw-r--r-- | src/s60main/qts60main_mcrt0.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp index a919593..725b17c 100644 --- a/src/s60main/qts60main.cpp +++ b/src/s60main/qts60main.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ // INCLUDE FILES +#include <exception> // must be before e32base.h so uncaught_exception gets defined #include <e32base.h> #include <qglobal.h> diff --git a/src/s60main/qts60main_mcrt0.cpp b/src/s60main/qts60main_mcrt0.cpp index 9439d2a..d30e07a 100644 --- a/src/s60main/qts60main_mcrt0.cpp +++ b/src/s60main/qts60main_mcrt0.cpp @@ -48,8 +48,8 @@ // EPOC32 version of crt0.c for C programs which always want multi-threaded support #include <e32std.h> +#include <exception> // must be before e32base.h so uncaught_exception gets defined #include <e32base.h> -#include <exception> #include "estlib.h" // Needed for QT_TRYCATCH_LEAVING. |