summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-14 08:41:43 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-14 08:41:43 (GMT)
commit90e6ee87cc12dbdfa8cf75881cf1b1a7103aafd4 (patch)
treef0ca3770ffa1e15ccc02f9d8af630bf593715229 /src/gui/painting
parente0c87958b1e2e61da80b2726226bc89982680161 (diff)
parente74d609b93f3480c239c4921c1683b3944aff44f (diff)
downloadQt-90e6ee87cc12dbdfa8cf75881cf1b1a7103aafd4.zip
Qt-90e6ee87cc12dbdfa8cf75881cf1b1a7103aafd4.tar.gz
Qt-90e6ee87cc12dbdfa8cf75881cf1b1a7103aafd4.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: Fix top-left corner of rounded rects in QPaintEngineEx
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qpaintengineex.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index 881bd6e..1e857e4 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -768,7 +768,7 @@ void QPaintEngineEx::drawRoundedRect(const QRectF &rect, qreal xRadius, qreal yR
x1, y2 - (1 - KAPPA) * yRadius,
x1, y2 - yRadius,
x1, y1 + yRadius, // LineTo
- x1, y1 + KAPPA * yRadius, // CurveTo
+ x1, y1 + (1 - KAPPA) * yRadius, // CurveTo
x1 + (1 - KAPPA) * xRadius, y1,
x1 + xRadius, y1
};