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

QtGlobal: mark qVersion() and qSharedBuild() as nothrow

Browse Source 
Change-Id: Id9dcf71363754cf6aae94012b22d144455e213eb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2012-08-07 10:54:00 +02:00 committed by Qt by Nokia
parent 1b0e279d5b
commit 2d2b12edb4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qglobal.cpp
View File

@ -860,12 +860,12 @@ Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n);
\sa QT_VERSION_STR \sa QT_VERSION_STR
*/ */
const char *qVersion() const char *qVersion() Q_DECL_NOTHROW
{ {
return QT_VERSION_STR; return QT_VERSION_STR;
} }
bool qSharedBuild() bool qSharedBuild() Q_DECL_NOTHROW
{ {
#ifdef QT_SHARED #ifdef QT_SHARED
return true; return true;

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

@ -556,8 +556,8 @@ Q_NORETURN Q_CORE_EXPORT void qTerminate() Q_DECL_NOTHROW;
# endif # endif
#endif #endif
Q_CORE_EXPORT const char *qVersion(); Q_CORE_EXPORT const char *qVersion() Q_DECL_NOTHROW;
Q_CORE_EXPORT bool qSharedBuild(); Q_CORE_EXPORT bool qSharedBuild() Q_DECL_NOTHROW;
#ifndef Q_OUTOFLINE_TEMPLATE #ifndef Q_OUTOFLINE_TEMPLATE
# define Q_OUTOFLINE_TEMPLATE # define Q_OUTOFLINE_TEMPLATE