1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move QT_NO_EXCEPTIONS define to qcompilerdetection.h

Browse Source 
Task-number: QTBUG-99313
Change-Id: I952267f18fd7ed001162aba7589c0040dbb9560e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Sona Kurazyan 2022-08-16 16:11:20 +02:00
parent 73dbc1fdf6
commit 7d22847371
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/global/qcompilerdetection.h
View File

@ -1313,6 +1313,17 @@ QT_WARNING_DISABLE_MSVC(4530) /* C++ exception handler used, but unwind semantic
# endif # endif
#endif #endif
#if !defined(QT_NO_EXCEPTIONS)
# if !defined(Q_MOC_RUN)
# if (defined(Q_CC_CLANG) && !__has_feature(cxx_exceptions)) || \
(defined(Q_CC_GNU) && !defined(__EXCEPTIONS))
# define QT_NO_EXCEPTIONS
# endif
# elif defined(QT_BOOTSTRAPPED)
# define QT_NO_EXCEPTIONS
# endif
#endif
#endif // __cplusplus #endif // __cplusplus
#endif // QCOMPILERDETECTION_H #endif // QCOMPILERDETECTION_H

12
src/corelib/global/qglobal.h
View File

@ -232,18 +232,6 @@ private:
If you can't live with those constraints, don't use these macros. If you can't live with those constraints, don't use these macros.
Use the QT_NO_EXCEPTIONS macro to protect your code instead. Use the QT_NO_EXCEPTIONS macro to protect your code instead.
*/ */
#if !defined(QT_NO_EXCEPTIONS)
# if !defined(Q_MOC_RUN)
# if (defined(Q_CC_CLANG) && !__has_feature(cxx_exceptions)) || \
(defined(Q_CC_GNU) && !defined(__EXCEPTIONS))
# define QT_NO_EXCEPTIONS
# endif
# elif defined(QT_BOOTSTRAPPED)
# define QT_NO_EXCEPTIONS
# endif
#endif
Q_NORETURN Q_DECL_COLD_FUNCTION Q_CORE_EXPORT void qTerminate() noexcept; Q_NORETURN Q_DECL_COLD_FUNCTION Q_CORE_EXPORT void qTerminate() noexcept;
#ifdef QT_NO_EXCEPTIONS #ifdef QT_NO_EXCEPTIONS
# define QT_TRY if (true) # define QT_TRY if (true)