summaryrefslogtreecommitdiffstats
path: root/src/gui/math3d/qvector3d.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-23 05:47:43 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-23 05:47:43 (GMT)
commit5054fafde6b32003c8c00877f2579c611d1524f3 (patch)
tree9f79976f970095706e82d7d65b068c1e7b728d97 /src/gui/math3d/qvector3d.h
parentdd652f37353a01e0172e20f1e7ef24b001a281db (diff)
parentdc68651b60b552e010735903e45328f8ebf18f69 (diff)
downloadQt-5054fafde6b32003c8c00877f2579c611d1524f3.zip
Qt-5054fafde6b32003c8c00877f2579c611d1524f3.tar.gz
Qt-5054fafde6b32003c8c00877f2579c611d1524f3.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/math3d/qvector3d.h')
-rw-r--r--src/gui/math3d/qvector3d.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h
index 873b388..7494dcf 100644
--- a/src/gui/math3d/qvector3d.h
+++ b/src/gui/math3d/qvector3d.h
@@ -271,14 +271,15 @@ inline QPointF QVector3D::toPointF() const
Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QVector3D &vector);
#endif
+#ifndef QT_NO_DATASTREAM
+Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QVector3D &);
+Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QVector3D &);
#endif
-QT_END_NAMESPACE
-
-#ifndef QT_NO_VECTOR3D
-Q_DECLARE_METATYPE(QVector3D)
#endif
+QT_END_NAMESPACE
+
QT_END_HEADER
#endif