From a7adf3ea1dd5998685bbfa709bb3d6700a3ff9c3 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 11 May 2016 17:26:49 -0700 Subject: Remove the Clang __has_feature(cxx_exceptions) check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The check in qglobal.h for __EXCEPTIONS is enough. This check here was causing moc to define QT_NO_EXCEPTIONS Change-Id: Id69569111e7d4e619e22ffff144daa661df4181d Reviewed-by: Jędrzej Nowacki --- src/corelib/global/qcompilerdetection.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src') diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 04f2084591..2c2f424319 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -650,11 +650,6 @@ /* General C++ features */ # define Q_COMPILER_RESTRICTED_VLA # define Q_COMPILER_THREADSAFE_STATICS -# if !__has_feature(cxx_exceptions) -# ifndef QT_NO_EXCEPTIONS -# define QT_NO_EXCEPTIONS -# endif -# endif # if !__has_feature(cxx_rtti) # define QT_NO_RTTI # endif -- cgit v1.2.3