diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-31 01:58:08 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-31 01:58:08 (GMT) |
commit | 9c5cea7d447019dcc5bad19ea3c27a358cccb2ed (patch) | |
tree | b10e3a9a0e9d005a31b20fe011a11eace86b4c7f /src/gui/painting/qpen.cpp | |
parent | 7184c41453c64f177f337b173f4ca82afead731d (diff) | |
parent | 1e60f5fb1c1ad9289247ef3bc47a94434b27dbea (diff) | |
download | Qt-9c5cea7d447019dcc5bad19ea3c27a358cccb2ed.zip Qt-9c5cea7d447019dcc5bad19ea3c27a358cccb2ed.tar.gz Qt-9c5cea7d447019dcc5bad19ea3c27a358cccb2ed.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/painting/qpen.cpp')
-rw-r--r-- | src/gui/painting/qpen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp index e290cbe..2e43984 100644 --- a/src/gui/painting/qpen.cpp +++ b/src/gui/painting/qpen.cpp @@ -92,7 +92,7 @@ typedef QPenPrivate QPenData; convenience functions to extract and set the color of the pen's brush, respectively. Pens may also be compared and streamed. - For more information about painting in general, see \l{The Paint + For more information about painting in general, see the \l{Paint System} documentation. \tableofcontents @@ -872,7 +872,7 @@ bool QPen::isDetached() Writes the given \a pen to the given \a stream and returns a reference to the \a stream. - \sa {Format of the QDataStream Operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator<<(QDataStream &s, const QPen &p) @@ -918,7 +918,7 @@ QDataStream &operator<<(QDataStream &s, const QPen &p) Reads a pen from the given \a stream into the given \a pen and returns a reference to the \a stream. - \sa {Format of the QDataStream Operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator>>(QDataStream &s, QPen &p) |