diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-06-18 11:10:26 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-06-18 11:10:26 (GMT) |
| commit | a3fd00796dafe52d4ff138b271564daf70d1adee (patch) | |
| tree | 77ca481c06c1b2c3c7822a4cd5864702e341b680 /src/gui/painting/qpainterpath.cpp | |
| parent | 793d1ed8d3a03eefdd487facdacf66ba575e1a07 (diff) | |
| parent | 6aa50af000f85cc4497749fcf0860c8ed244a60e (diff) | |
| download | Qt-a3fd00796dafe52d4ff138b271564daf70d1adee.zip Qt-a3fd00796dafe52d4ff138b271564daf70d1adee.tar.gz Qt-a3fd00796dafe52d4ff138b271564daf70d1adee.tar.bz2 | |
Merge remote branch 'qt/4.7' into lighthouse
Conflicts:
configure
mkspecs/common/qws.conf
src/corelib/io/qresource.cpp
src/gui/image/qpixmapdata_p.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/opengl/qgl_p.h
src/plugins/mediaservices/gstreamer/gstreamer.pro
Diffstat (limited to 'src/gui/painting/qpainterpath.cpp')
| -rw-r--r-- | src/gui/painting/qpainterpath.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index f5a698e..ffd0d5c 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -2307,7 +2307,7 @@ QPainterPath &QPainterPath::operator-=(const QPainterPath &other) Writes the given painter \a path 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 QPainterPath &p) { @@ -2334,7 +2334,7 @@ QDataStream &operator<<(QDataStream &s, const QPainterPath &p) Reads a painter path from the given \a stream into the specified \a path, and returns a reference to the \a stream. - \sa {Format of the QDataStream Operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator>>(QDataStream &s, QPainterPath &p) { |