Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
QtGlobal: mark qVersion() and qSharedBuild() as nothrow
Change-Id: Id9dcf71363754cf6aae94012b22d144455e213eb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
  • Loading branch information
marc-kdab authored and Qt by Nokia committed Sep 7, 2012
1 parent 1b0e279 commit 2d2b12e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/corelib/global/qglobal.cpp
Expand Up @@ -860,12 +860,12 @@ Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n);
\sa QT_VERSION_STR
*/

const char *qVersion()
const char *qVersion() Q_DECL_NOTHROW
{
return QT_VERSION_STR;
}

bool qSharedBuild()
bool qSharedBuild() Q_DECL_NOTHROW
{
#ifdef QT_SHARED
return true;
Expand Down
4 changes: 2 additions & 2 deletions src/corelib/global/qglobal.h
Expand Up @@ -556,8 +556,8 @@ Q_NORETURN Q_CORE_EXPORT void qTerminate() Q_DECL_NOTHROW;
# endif
#endif

Q_CORE_EXPORT const char *qVersion();
Q_CORE_EXPORT bool qSharedBuild();
Q_CORE_EXPORT const char *qVersion() Q_DECL_NOTHROW;
Q_CORE_EXPORT bool qSharedBuild() Q_DECL_NOTHROW;

#ifndef Q_OUTOFLINE_TEMPLATE
# define Q_OUTOFLINE_TEMPLATE
Expand Down

0 comments on commit 2d2b12e

Please sign in to comment.