summaryrefslogtreecommitdiffstats
path: root/src/gui/math3d/qquaternion.h
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2009-11-05 06:26:24 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2009-11-05 06:26:24 (GMT)
commitee88b2d8408396188eb2ce52d740c395c6cd4656 (patch)
tree1f59ea0612fecbaca595594d3812dd2aab64cf63 /src/gui/math3d/qquaternion.h
parent673973acc20ce4e068d63fa5b0391f5c785be8a3 (diff)
parentaa58293b57a05cd52b36ba14a05958dceb65c603 (diff)
downloadQt-ee88b2d8408396188eb2ce52d740c395c6cd4656.zip
Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.tar.gz
Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.tar.bz2
Merge remote branch 'qt-official/4.6' into 4.6
Diffstat (limited to 'src/gui/math3d/qquaternion.h')
-rw-r--r--src/gui/math3d/qquaternion.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h
index 7480a5c..5b2454f 100644
--- a/src/gui/math3d/qquaternion.h
+++ b/src/gui/math3d/qquaternion.h
@@ -95,7 +95,7 @@ public:
QQuaternion conjugate() const;
- QVector3D rotateVector(const QVector3D& vector) const;
+ QVector3D rotatedVector(const QVector3D& vector) const;
QQuaternion &operator+=(const QQuaternion &quaternion);
QQuaternion &operator-=(const QQuaternion &quaternion);