diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /src/quick/items/qquickrectangle.cpp | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'src/quick/items/qquickrectangle.cpp')
| -rw-r--r-- | src/quick/items/qquickrectangle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp index f619d3b85a..ab8203d0a8 100644 --- a/src/quick/items/qquickrectangle.cpp +++ b/src/quick/items/qquickrectangle.cpp @@ -132,7 +132,7 @@ bool QQuickPen::isValid() const \instantiates QQuickGradientStop \inqmlmodule QtQuick \ingroup qtquick-visual-utility - \brief Defines the color at a position in a Gradient + \brief Defines the color at a position in a Gradient. \sa Gradient */ @@ -184,7 +184,7 @@ void QQuickGradientStop::updateGradient() \instantiates QQuickGradient \inqmlmodule QtQuick \ingroup qtquick-visual-utility - \brief Defines a gradient fill + \brief Defines a gradient fill. A gradient is defined by two or more colors, which will be blended seamlessly. @@ -303,7 +303,7 @@ int QQuickRectanglePrivate::doUpdateSlotIdx = -1; \inqmlmodule QtQuick \inherits Item \ingroup qtquick-visual - \brief Paints a filled rectangle with an optional border + \brief Paints a filled rectangle with an optional border. Rectangle items are used to fill areas with solid color or gradients, and/or to provide a rectangular border. |