diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-04 08:00:30 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-04 08:03:47 (GMT) |
| commit | bd07aa3419be10cffee2d9eba359dd25fbdb11f2 (patch) | |
| tree | 1bd6e36cf81ea0c68bb9b9425fc9ef0a9a93c1ef /src/corelib | |
| parent | f5a66d49fee5b9f910b759831dd4762076b3a9d3 (diff) | |
| download | Qt-bd07aa3419be10cffee2d9eba359dd25fbdb11f2.zip Qt-bd07aa3419be10cffee2d9eba359dd25fbdb11f2.tar.gz Qt-bd07aa3419be10cffee2d9eba359dd25fbdb11f2.tar.bz2 | |
Fix QDialog test compilation on Mac
moc on Mac define itself as GCC, but does not define the __EXCEPTIONS macro.
It then defined QT_NO_EXCEPTIONS and did not generate the moc output for some
classes, resulting in link errors later.
Reviewed-by: Gabi
Diffstat (limited to 'src/corelib')
| -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 d279891..a2c532f 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 |