diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/concurrent/concurrent.pro | 2 | ||||
| -rw-r--r-- | src/corelib/corelib.pro | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 9 | ||||
| -rw-r--r-- | src/testlib/testlib.pro | 2 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 1 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 1 |
6 files changed, 9 insertions, 8 deletions
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index 54359f7d3b..b0809c8939 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -4,7 +4,7 @@ TARGET = QtConcurrent QPRO_PWD = $$PWD QT = core-private -CONFIG += module +CONFIG += module exceptions MODULE_PRI = ../modules/qt_concurrent.pri DEFINES += QT_BUILD_CONCURRENT_LIB QT_NO_USING_NAMESPACE 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 diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 47a52318e8..142a854693 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -4,7 +4,7 @@ TARGET = QtTest QPRO_PWD = $$PWD QT = core -CONFIG += module +CONFIG += module exceptions MODULE_PRI = ../modules/qt_testlib.pri INCLUDEPATH += . diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 6a7eb8538f..7de9a2420a 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -5,6 +5,7 @@ build_all:!build_pass { CONFIG += release } CONFIG -= app_bundle +CONFIG += exceptions_off DEFINES += \ QT_BOOTSTRAPPED \ diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 37b4c3dd1d..239f9e58b3 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -4,6 +4,7 @@ CONFIG += staticlib CONFIG += console qtinc CONFIG -= qt +CONFIG += exceptions_off build_all:!build_pass { CONFIG -= build_all CONFIG += release |