diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-20 08:22:14 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-20 08:22:14 (GMT) |
| commit | d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62 (patch) | |
| tree | 462bf65a95e6de5438c728cbf157994e9684cd37 /src/corelib/tools/qstring.cpp | |
| parent | eff255bd29a8cbd09494f9e9480c2e4b07869386 (diff) | |
| parent | a948c797e0c45c965ada005b34c274514a3c4d42 (diff) | |
| download | Qt-d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62.zip Qt-d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62.tar.gz Qt-d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
examples/declarative/toys/dynamicscene/qml/itemCreation.js
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 0169b20..612c492 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -7385,7 +7385,7 @@ QString &QString::setRawData(const QChar *unicode, int size) Writes the given \a string to the specified \a stream. - \sa {Format of the QDataStream Operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator<<(QDataStream &out, const QString &str) @@ -7433,7 +7433,7 @@ QDataStream &operator<<(QDataStream &out, const QString &str) Reads a string from the specified \a stream into the given \a string. - \sa {Format of the QDataStream Operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator>>(QDataStream &in, QString &str) |