diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/corelib.pro | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 4856c1b5fb..545a94fdee 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -4,7 +4,7 @@ TARGET = QtCore QPRO_PWD = $$PWD QT = -CONFIG += module +CONFIG += module exceptions MODULE = core # not corelib, as per project file MODULE_PRI = ../modules/qt_core.pri diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index a8547a3ab8..911759892b 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -659,11 +659,10 @@ inline void qt_noop(void) {} Use the QT_NO_EXCEPTIONS macro to protect your code instead. */ -#ifdef QT_BOOTSTRAPPED -# define QT_NO_EXCEPTIONS -#endif -#if !defined(QT_NO_EXCEPTIONS) && defined(Q_CC_GNU) && !defined (__EXCEPTIONS) && !defined(Q_MOC_RUN) -# define QT_NO_EXCEPTIONS +#if !defined(QT_NO_EXCEPTIONS) +# if defined(QT_BOOTSTRAPPED) || (defined(Q_CC_GNU) && !defined (__EXCEPTIONS) && !defined(Q_MOC_RUN)) +# define QT_NO_EXCEPTIONS +# endif #endif #ifdef QT_NO_EXCEPTIONS |