diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-07 13:47:20 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-07 13:51:33 (GMT) |
| commit | 5c15ea9cdfeb39d0f040e144756a7d4e2bd23670 (patch) | |
| tree | cd8ba974c2066113cfacd45170d75cbbfdb50784 /src/corelib | |
| parent | f049c1b99ed41e5ccf6100cb12a0f443481b4ea5 (diff) | |
| download | Qt-5c15ea9cdfeb39d0f040e144756a7d4e2bd23670.zip Qt-5c15ea9cdfeb39d0f040e144756a7d4e2bd23670.tar.gz Qt-5c15ea9cdfeb39d0f040e144756a7d4e2bd23670.tar.bz2 | |
Fix warning when compiling with QT_NO_EXCEPTIONS
src/corelib/global/qglobal.h:1368:1: warning: "QT_NO_EXCEPTIONS" redefined
Reviewed-by: Alexis
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 a2c532f..7285f69 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) && !defined(Q_MOC_RUN) +#if !defined(QT_NO_EXCEPTIONS) && defined(Q_CC_GNU) && !defined (__EXCEPTIONS) && !defined(Q_MOC_RUN) # define QT_NO_EXCEPTIONS #endif |