summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qtransform.h
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2009-05-20 16:41:05 (GMT)
committerSamuel Rødal <sroedal@trolltech.com>2009-05-20 16:41:05 (GMT)
commitf9d26f0bebd5bcc32d15c4a627251c44cf78389e (patch)
tree64a13ad1e625f35811286d8d468fe9f504a29df8 /src/gui/painting/qtransform.h
parent64fb80c40cb0fd978923d1931670ba70466bc76e (diff)
parent56a8e78869325453010fb6c41a5e2b9e6f8f1c95 (diff)
downloadQt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.zip
Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.tar.gz
Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.tar.bz2
Merge commit 'origin/4.5'
Diffstat (limited to 'src/gui/painting/qtransform.h')
-rw-r--r--src/gui/painting/qtransform.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h
index 059752b..7e93f74 100644
--- a/src/gui/painting/qtransform.h
+++ b/src/gui/painting/qtransform.h
@@ -342,7 +342,7 @@ inline QTransform &QTransform::operator-=(qreal num)
# if Q_CC_GNU_VERSION >= 0x040201
# pragma GCC diagnostic warning "-Wfloat-equal"
# endif
-# undef Q_GCC_GNU_VERSION
+# undef Q_CC_GNU_VERSION
#endif
/****** stream functions *******************/