diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
| commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
| tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /src/gui/painting/qbrush.cpp | |
| parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
| parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro
Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'src/gui/painting/qbrush.cpp')
| -rw-r--r-- | src/gui/painting/qbrush.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 98ed02879a..d644bbace1 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -1277,7 +1277,7 @@ QDataStream &operator>>(QDataStream &s, QBrush &b) {coordinate mode} use coordinateMode(). - \sa {demos/gradients}{The Gradients Demo}, QBrush + \sa {painting/gradients}{The Gradients Example}, QBrush */ /*! @@ -1587,8 +1587,8 @@ bool QGradient::operator==(const QGradient &gradient) returns the final stop point of the gradient, and the start() function returning the start point of the gradient. - \sa QRadialGradient, QConicalGradient, {demos/gradients}{The - Gradients Demo} + \sa QRadialGradient, QConicalGradient, {painting/gradients}{The + Gradients Example} */ @@ -1773,8 +1773,8 @@ void QLinearGradient::setFinalStop(const QPointF &stop) radius() functions returning the gradient's center, focal point and radius respectively. - \sa QLinearGradient, QConicalGradient, {demos/gradients}{The - Gradients Demo} + \sa QLinearGradient, QConicalGradient, {painting/gradients}{The + Gradients Example} */ static QPointF qt_radial_gradient_adapt_focal_point(const QPointF ¢er, @@ -2143,8 +2143,8 @@ void QRadialGradient::setFocalPoint(const QPointF &focalPoint) gradient can be specified through its radius or final stop points, respectively. - \sa QLinearGradient, QRadialGradient, {demos/gradients}{The - Gradients Demo} + \sa QLinearGradient, QRadialGradient, {painting/gradients}{The + Gradients Example} */ |