summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qtransform.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-05-22 12:32:27 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-05-22 12:32:27 (GMT)
commitd001cef792b2f41615cb1f7657bed3d7525ffb0e (patch)
tree03ec9dc4a9a870d2b8902083d56431d8b4b54217 /src/gui/painting/qtransform.h
parenta0fb8f874d0b8b8db5f50706a432bdb5a0294bf0 (diff)
parent1cfb5bcaa2cab142479ee975e25d9f605f852dad (diff)
downloadQt-d001cef792b2f41615cb1f7657bed3d7525ffb0e.zip
Qt-d001cef792b2f41615cb1f7657bed3d7525ffb0e.tar.gz
Qt-d001cef792b2f41615cb1f7657bed3d7525ffb0e.tar.bz2
Merge branch '4.5'
Diffstat (limited to 'src/gui/painting/qtransform.h')
-rw-r--r--src/gui/painting/qtransform.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h
index 7e93f74..aac7c31 100644
--- a/src/gui/painting/qtransform.h
+++ b/src/gui/painting/qtransform.h
@@ -275,13 +275,6 @@ 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.)
@@ -338,13 +331,6 @@ 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_CC_GNU_VERSION
-#endif
-
/****** stream functions *******************/
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QTransform &);
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QTransform &);