From 2d2b12edb4caa67695ea1c755d98fd0e9d5fe4f8 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 7 Aug 2012 10:54:00 +0200 Subject: [PATCH] QtGlobal: mark qVersion() and qSharedBuild() as nothrow Change-Id: Id9dcf71363754cf6aae94012b22d144455e213eb Reviewed-by: Thiago Macieira --- src/corelib/global/qglobal.cpp | 4 ++-- src/corelib/global/qglobal.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 9b9d4b0faa..e1eb2736c2 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -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; diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 350b811df8..8aea18dcb2 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -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