summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qtransform.cpp
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-18 10:39:16 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-18 10:39:16 (GMT)
commit0b96a20f201dbd91599ee890f42dd8e452d15f79 (patch)
treefbefbfe77e669f7d58a39c2be612a7098e6f7e17 /src/gui/painting/qtransform.cpp
parent379073630202d37cf8e3927dc9745134ac2f5512 (diff)
parent7a64a3f67d53a99e6e2200f6481c98013004b4e4 (diff)
downloadQt-0b96a20f201dbd91599ee890f42dd8e452d15f79.zip
Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.gz
Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts: src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
Diffstat (limited to 'src/gui/painting/qtransform.cpp')
-rw-r--r--src/gui/painting/qtransform.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 8832a3d..859767b 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE
\class QTransform
\brief The QTransform class specifies 2D transformations of a coordinate system.
\since 4.3
- \ingroup multimedia
+ \ingroup painting
A transformation specifies how to translate, scale, shear, rotate
or project the coordinate system, and is typically used when