diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-07 10:54:00 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-07 15:39:31 +0200 |
| commit | 2d2b12edb4caa67695ea1c755d98fd0e9d5fe4f8 (patch) | |
| tree | da299098a9ad7e5d1cfa55052c18b74e195aa219 /src | |
| parent | 1b0e279d5b52df60fdf81c648a59773fe84d6fc0 (diff) | |
QtGlobal: mark qVersion() and qSharedBuild() as nothrow
Change-Id: Id9dcf71363754cf6aae94012b22d144455e213eb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 4 | ||||
| -rw-r--r-- | 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 |