summaryrefslogtreecommitdiffstats
path: root/src/gui/math3d/qvector4d.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-09-04 08:14:34 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-09-04 08:14:34 (GMT)
commit57e75716ac3eb47ca2d801e116a6b12a200c8808 (patch)
tree4ae57782c40e90cf2ada92156f660975bad6c1a4 /src/gui/math3d/qvector4d.h
parent807d129265b05e0f5e575e126e97078d96b16242 (diff)
parentbd07aa3419be10cffee2d9eba359dd25fbdb11f2 (diff)
downloadQt-57e75716ac3eb47ca2d801e116a6b12a200c8808.zip
Qt-57e75716ac3eb47ca2d801e116a6b12a200c8808.tar.gz
Qt-57e75716ac3eb47ca2d801e116a6b12a200c8808.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/math3d/qvector4d.h')
-rw-r--r--src/gui/math3d/qvector4d.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h
index 4bd6639..520319a 100644
--- a/src/gui/math3d/qvector4d.h
+++ b/src/gui/math3d/qvector4d.h
@@ -54,7 +54,6 @@ QT_MODULE(Gui)
class QMatrix4x4;
class QVector2D;
class QVector3D;
-class QQuaternion;
#ifndef QT_NO_VECTOR4D
@@ -133,8 +132,6 @@ private:
friend class QVector2D;
friend class QVector3D;
- friend class QQuaternion;
- friend class QMatrix4x4;
#ifndef QT_NO_MATRIX4X4
friend QVector4D operator*(const QVector4D& vector, const QMatrix4x4& matrix);
friend QVector4D operator*(const QMatrix4x4& matrix, const QVector4D& vector);