diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-08 00:14:12 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-08 00:14:12 (GMT) |
| commit | f6c08f5e68c90338a8402c0912cd6be72e84b1e6 (patch) | |
| tree | d928f975e686b752cd1fc47eca812f376d9d0a03 /src/corelib/global/qglobal.h | |
| parent | 276a44c0867a76a90b425baa8dcbda733d25b3fb (diff) | |
| parent | 0cbbc9cb9e87a3a39ee1597f4cea1c2b77d8f8da (diff) | |
| download | Qt-f6c08f5e68c90338a8402c0912cd6be72e84b1e6.zip Qt-f6c08f5e68c90338a8402c0912cd6be72e84b1e6.tar.gz Qt-f6c08f5e68c90338a8402c0912cd6be72e84b1e6.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 68246f2..57be50a 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1372,7 +1372,7 @@ inline void qt_noop() {} #ifdef QT_BOOTSTRAPPED # define QT_NO_EXCEPTIONS #endif -#if defined(Q_CC_GNU) && !defined (__EXCEPTIONS) +#if !defined(QT_NO_EXCEPTIONS) && defined(Q_CC_GNU) && !defined (__EXCEPTIONS) && !defined(Q_MOC_RUN) # define QT_NO_EXCEPTIONS #endif |