diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-01 22:43:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-01 22:43:48 (GMT) |
| commit | b52bfac9d05de835682b9c2b2e1d79e0246e708a (patch) | |
| tree | 456eb1b84771bb619877a9765bb9e431a073eb0b /src/corelib/global/qglobal.h | |
| parent | 93906071c31a5008625e727dad530a6f05441baa (diff) | |
| parent | add57539ec7cd24346e26b22a5298da50d81e91b (diff) | |
| download | Qt-b52bfac9d05de835682b9c2b2e1d79e0246e708a.zip Qt-b52bfac9d05de835682b9c2b2e1d79e0246e708a.tar.gz Qt-b52bfac9d05de835682b9c2b2e1d79e0246e708a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 55eb4fa..ed403cb 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1372,6 +1372,9 @@ inline void qt_noop() {} #ifdef QT_BOOTSTRAPPED # define QT_NO_EXCEPTIONS #endif +#if defined(Q_CC_GNU) && !defined (__EXCEPTIONS) +# define QT_NO_EXCEPTIONS +#endif #ifdef QT_NO_EXCEPTIONS # define QT_TRY if (true) |