diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-25 08:03:17 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-25 08:03:17 (GMT) |
| commit | 07cee1caa5238a9c4a132b6e37a0ef82b665c568 (patch) | |
| tree | 0c32d805837dc734b813ca76741a744a4c637a2c /src/gui/painting/qtransform.h | |
| parent | b23dc7fb8bc8de6617684249411b5399f1d06631 (diff) | |
| parent | 662494c7a20d6612948a672e5e9c87b9173d9560 (diff) | |
| download | Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.zip Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.tar.gz Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Conflicts:
src/gui/styles/qs60style.cpp
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 &); |