diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-04 08:25:13 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-04 08:25:13 (GMT) |
| commit | 6c3f538a0657bd7b00f32934234395682623c17a (patch) | |
| tree | 1185d0a014f09dec9c44dc336a6514d716c15eab /src/corelib/global/qglobal.h | |
| parent | 0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1 (diff) | |
| parent | 92a3662564f421a46761989d153f6c8eb990131f (diff) | |
| download | Qt-6c3f538a0657bd7b00f32934234395682623c17a.zip Qt-6c3f538a0657bd7b00f32934234395682623c17a.tar.gz Qt-6c3f538a0657bd7b00f32934234395682623c17a.tar.bz2 | |
Merge branch '4.6'
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 e07cdb3..e63c1f9 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1364,7 +1364,7 @@ inline void qt_noop() {} #ifdef QT_BOOTSTRAPPED # define QT_NO_EXCEPTIONS #endif -#if defined(Q_CC_GNU) && !defined (__EXCEPTIONS) +#if defined(Q_CC_GNU) && !defined (__EXCEPTIONS) && !defined(Q_MOC_RUN) # define QT_NO_EXCEPTIONS #endif |