diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 09:30:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 09:30:51 (GMT) |
| commit | b637bf02f182d6bce128e29887a23eb2281443e5 (patch) | |
| tree | ac1e4d1347d40f0fec90d7943940efdbc1062687 | |
| parent | 16e8cc808ae7087aadd95855c97d715941711b45 (diff) | |
| parent | fb27eba721b41cb1b8557ffff663f9747a3922db (diff) | |
| download | Qt-b637bf02f182d6bce128e29887a23eb2281443e5.zip Qt-b637bf02f182d6bce128e29887a23eb2281443e5.tar.gz Qt-b637bf02f182d6bce128e29887a23eb2281443e5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed rounded SVG rectangles when 'rx' or 'ry' is 0.
| -rw-r--r-- | src/svg/qsvghandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 926b04d..bc4ca76 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 |