diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-05-19 10:30:10 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-05-19 10:30:10 (GMT) |
| commit | d4249a4539e3afc5d3af2f20610d3ce8f2d58464 (patch) | |
| tree | 6f61a544d273264c5db0403852a6046c8953aa84 | |
| parent | c8f8405d154cf1c24b50777e5db2ac2ab1609b39 (diff) | |
| parent | 30f7edc0aab629499b74263391ae529ad31b2ff8 (diff) | |
| download | Qt-d4249a4539e3afc5d3af2f20610d3ce8f2d58464.zip Qt-d4249a4539e3afc5d3af2f20610d3ce8f2d58464.tar.gz Qt-d4249a4539e3afc5d3af2f20610d3ce8f2d58464.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | src/gui/painting/qtransform.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index c76409b..4ea1be3 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -255,6 +255,13 @@ inline qreal QTransform::dy() const return affine._dy; } +#if defined(Q_CC_GNU) +# define Q_CC_GNU_VERSION (((__GNUC__)<<16)|((__GNUC_MINOR__)<<8)|(__GNUC_PATCHLEVEL__)) +# if Q_CC_GNU_VERSION >= 0x040201 +# pragma GCC diagnostic ignored "-Wfloat-equal" +# endif +#endif + inline QTransform &QTransform::operator*=(qreal num) { if (num == 1.) @@ -311,6 +318,13 @@ inline QTransform &QTransform::operator-=(qreal num) return *this; } +#if defined(Q_CC_GNU_VERSION) +# if Q_CC_GNU_VERSION >= 0x040201 +# pragma GCC diagnostic warning "-Wfloat-equal" +# endif +# undef Q_GCC_GNU_VERSION +#endif + /****** stream functions *******************/ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QTransform &); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QTransform &); |