diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-04 13:41:52 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-04 13:44:29 +0100 |
| commit | 8ac63a3323585de28428df3f376bdf3f3c2a67fb (patch) | |
| tree | d0c4f9f0d48864ca5439bba3186485df48d0d165 /src/gui/painting | |
| parent | 59f168c5e5eec7ac247e6154a65f85a7ccc6e7ad (diff) | |
| parent | 88550543f8b4b7c76bffeebb923ad1f72b774b6e (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I556be99cc7ad3fc6f7177542b7444269616a7478
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qbezier.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp index e5c9e8d773..8e0e76f787 100644 --- a/src/gui/painting/qbezier.cpp +++ b/src/gui/painting/qbezier.cpp @@ -401,8 +401,8 @@ int QBezier::shifted(QBezier *curveSegments, int maxSegments, qreal offset, floa Q_ASSERT(curveSegments); Q_ASSERT(maxSegments > 0); - if (x1 == x2 && x1 == x3 && x1 == x4 && - y1 == y2 && y1 == y3 && y1 == y4) + if (qFuzzyCompare(x1, x2) && qFuzzyCompare(x1, x3) && qFuzzyCompare(x1, x4) && + qFuzzyCompare(y1, y2) && qFuzzyCompare(y1, y3) && qFuzzyCompare(y1, y4)) return 0; --maxSegments; |