diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2012-08-27 15:36:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-28 23:34:25 +0200 |
| commit | 823da2d308c974761a9f23ba67b993c986f0a823 (patch) | |
| tree | 9c5225484cca493e192250d8e25ed96554fe6d29 /src/corelib | |
| parent | 21c2e780b1b79562ce2865b8443538fa0a9c253a (diff) | |
Fix warning when compliling with -Wconversion.
Change-Id: I90bf9f9a1860cabb67bc92599e7ccce94496d134
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 2acff12e3a..3558cbd08f 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -414,9 +414,9 @@ template <typename T> Q_DECL_CONSTEXPR inline T qAbs(const T &t) { return t >= 0 ? t : -t; } Q_DECL_CONSTEXPR inline int qRound(double d) -{ return d >= 0.0 ? int(d + 0.5) : int(d - int(d-1) + 0.5) + int(d-1); } +{ return d >= 0.0 ? int(d + 0.5) : int(d - double(int(d-1)) + 0.5) + int(d-1); } Q_DECL_CONSTEXPR inline int qRound(float d) -{ return d >= 0.0f ? int(d + 0.5f) : int(d - int(d-1) + 0.5f) + int(d-1); } +{ return d >= 0.0f ? int(d + 0.5f) : int(d - float(int(d-1)) + 0.5f) + int(d-1); } #ifdef Q_QDOC /* Just for documentation generation |