diff options
| author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-21 07:31:51 (GMT) |
|---|---|---|
| committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-21 07:31:51 (GMT) |
| commit | 47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743 (patch) | |
| tree | e8518206ec161750de9722aee17eb82805cca061 /src/gui/painting/qtransform.h | |
| parent | 0987e68043e174a2a033b58d065c6069c0cf8a1a (diff) | |
| parent | a064fe66f5256c7ded6f3df87f503aa0fb8e341b (diff) | |
| download | Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.zip Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.tar.gz Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/painting/qtransform.h')
| -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 &); |