diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-06-10 07:59:36 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-06-10 07:59:36 (GMT) |
| commit | 5d43a51bb53718b9c98b1720ed46469e5b77fa6f (patch) | |
| tree | f3f277e83ee6ae21c11730a62173e9463bd53a63 /src | |
| parent | 2d34a0f7cc4a7302871c942a827bd4278cdde10b (diff) | |
| parent | 0b5b2664d5ca6dfbe9c6a0170bbd2caaa47ccd3b (diff) | |
| download | Qt-5d43a51bb53718b9c98b1720ed46469e5b77fa6f.zip Qt-5d43a51bb53718b9c98b1720ed46469e5b77fa6f.tar.gz Qt-5d43a51bb53718b9c98b1720ed46469e5b77fa6f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 27aaac1..b075db6 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1055,8 +1055,13 @@ inline T qAbs(const T &t) { return t >= 0 ? t : -t; } inline int qRound(qreal d) { return d >= 0.0 ? int(d + 0.5) : int(d - int(d-1) + 0.5) + int(d-1); } +#if defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE) || defined(QT_ARCH_SYMBIAN) +inline qint64 qRound64(double d) +{ return d >= 0.0 ? qint64(d + 0.5) : qint64(d - qint64(d-1) + 0.5) + qint64(d-1); } +#else inline qint64 qRound64(qreal d) { return d >= 0.0 ? qint64(d + 0.5) : qint64(d - qint64(d-1) + 0.5) + qint64(d-1); } +#endif template <typename T> inline const T &qMin(const T &a, const T &b) { if (a < b) return a; return b; } |