summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-03-11 09:18:59 (GMT)
committerSamuli Piippo <samuli.piippo@digia.com>2011-06-09 10:05:11 (GMT)
commit3c01c892513c27a2d965444468a1c7bfc895e7a0 (patch)
tree5643fbc05473c13af40e5fb0febec587d111d574
parent34147cb46ecaae467673a35cb5b7f5fdd89597f5 (diff)
downloadQt-3c01c892513c27a2d965444468a1c7bfc895e7a0.zip
Qt-3c01c892513c27a2d965444468a1c7bfc895e7a0.tar.gz
Qt-3c01c892513c27a2d965444468a1c7bfc895e7a0.tar.bz2
Fixed rounded SVG rectangles when 'rx' or 'ry' is 0.
Task-number: QTBUG-8264 Reviewed-by: Trond (cherry picked from commit fb27eba721b41cb1b8557ffff663f9747a3922db)
-rw-r--r--src/svg/qsvghandler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 41054d6..d36690e 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -2962,9 +2962,9 @@ static QSvgNode *createRectNode(QSvgNode *parent,
if (nry > bounds.height()/2)
nry = bounds.height()/2;
- if (nrx && !nry)
+ if (!rx.isEmpty() && ry.isEmpty())
nry = nrx;
- else if (nry && !nrx)
+ else if (!ry.isEmpty() && rx.isEmpty())
nrx = nry;
//we draw rounded rect from 0...99