AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qglobal.h: use the GCC attribute for nothrow in C mode

Browse Source 
There's exactly one use in Qt: the qVersion() function.

Change-Id: Ieb9a2aa1ea914b1b956bfffd16eff4b3b9e2119a
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Thiago Macieira 2022-05-17 10:30:41 -07:00
parent d02e1eaae0
commit 23184fb6cd
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -911,10 +911,14 @@
#else #else
# define Q_CONSTEXPR const # define Q_CONSTEXPR const
# define Q_DECL_CONSTEXPR # define Q_DECL_CONSTEXPR
# define Q_DECL_NOEXCEPT
# define Q_DECL_RELAXED_CONSTEXPR # define Q_DECL_RELAXED_CONSTEXPR
# define Q_NULLPTR NULL # define Q_NULLPTR NULL
# define Q_RELAXED_CONSTEXPR const # define Q_RELAXED_CONSTEXPR const
# ifdef Q_CC_GNU
# define Q_DECL_NOEXCEPT __attribute__((__nothrow__))
# else
# define Q_DECL_NOEXCEPT
# endif
#endif #endif
#if __has_cpp_attribute(nodiscard) && (!defined(Q_CC_CLANG) || __cplusplus > 201402L) // P0188R1 #if __has_cpp_attribute(nodiscard) && (!defined(Q_CC_CLANG) || __cplusplus > 201402L) // P0188R1

3
tests/auto/corelib/global/qglobal/qglobal.c
View File

@ -51,7 +51,8 @@ int tst_QtVersion()
return QT_VERSION; return QT_VERSION;
} }
const char *tst_qVersion() Q_DECL_NOEXCEPT const char *tst_qVersion() Q_DECL_NOEXCEPT;
const char *tst_qVersion()
{ {
#if !defined(QT_NAMESPACE) #if !defined(QT_NAMESPACE)
return qVersion(); return qVersion();