Allow resetting a Rectangle gradient.
authorMartin Jones <martin.jones@nokia.com>
Tue, 3 Jul 2012 05:04:19 +0000 (15:04 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 3 Jul 2012 05:27:22 +0000 (07:27 +0200)
commitf39c22ecec295d44eb1604e0a5dd5400093f0322
tree836c1f2d9abe90bf6214e19301dd518a65201f8b
parente1b3ad7c831023c3e336414a16b69773adea4e26
Allow resetting a Rectangle gradient.

If a gradient and a color are set on a rectangle, the gradient is used.
This means that if you wish to override the gradient on a component with
a color, you have to unset the gradient.

Also remove the unused QQuickGradient::gradient() method.

Task-number: QTBUG-23238
Change-Id: Ibd43cfe1bd4b867e4f6103f1d0dc0ed6176ab5c1
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
src/quick/items/qquickrectangle.cpp
src/quick/items/qquickrectangle_p.h
tests/auto/quick/qquickrectangle/data/gradient.qml [new file with mode: 0644]
tests/auto/quick/qquickrectangle/qquickrectangle.pro [new file with mode: 0644]
tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp [new file with mode: 0644]
tests/auto/quick/quick.pro