diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-05-27 13:01:29 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-05-27 13:01:29 (GMT) |
| commit | 016b89d07478c91617ad345a0b3d7f16d0f8cd21 (patch) | |
| tree | b56f2a81e112d08cc6d629ea2e6e1e4259b56f35 /src/gui/math3d/qvector4d.cpp | |
| parent | 4459b4b29073bb82fe480b5eac1a4d9241068b38 (diff) | |
| parent | 103e1e8ea5e8879f2bb97e008840a212b3004a51 (diff) | |
| download | Qt-016b89d07478c91617ad345a0b3d7f16d0f8cd21.zip Qt-016b89d07478c91617ad345a0b3d7f16d0f8cd21.tar.gz Qt-016b89d07478c91617ad345a0b3d7f16d0f8cd21.tar.bz2 | |
Merge commit 'origin/4.7' into symbian47
Conflicts:
src/plugins/bearer/symbian/qnetworksession_impl.h
Diffstat (limited to 'src/gui/math3d/qvector4d.cpp')
| -rw-r--r-- | src/gui/math3d/qvector4d.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp index f2f3cc6..abff1ba 100644 --- a/src/gui/math3d/qvector4d.cpp +++ b/src/gui/math3d/qvector4d.cpp @@ -538,7 +538,7 @@ QDebug operator<<(QDebug dbg, const QVector4D &vector) Writes the given \a vector to the given \a stream and returns a reference to the stream. - \sa {Format of the QDataStream Operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator<<(QDataStream &stream, const QVector4D &vector) @@ -555,7 +555,7 @@ QDataStream &operator<<(QDataStream &stream, const QVector4D &vector) Reads a 4D vector from the given \a stream into the given \a vector and returns a reference to the stream. - \sa {Format of the QDataStream Operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator>>(QDataStream &stream, QVector4D &vector) |