diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 12:28:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 12:28:42 (GMT) |
| commit | 662174b78b7e08c759d0086e215e81e9e0eaf0c5 (patch) | |
| tree | 3f503afdaef99dc3c0f8ec73cc1c9a26eee56b6d /src/gui | |
| parent | afcf63661173b78623245b4892cd282f9c7d8986 (diff) | |
| parent | 4e2d549e8b2e34c5bd4c77a4a6eba99ed0912168 (diff) | |
| download | Qt-662174b78b7e08c759d0086e215e81e9e0eaf0c5.zip Qt-662174b78b7e08c759d0086e215e81e9e0eaf0c5.tar.gz Qt-662174b78b7e08c759d0086e215e81e9e0eaf0c5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove a race condition in SIGCHLD handler.
Fix warnings about && inside ||
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qpainterpath.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 2058040..27aed32 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -1904,7 +1904,7 @@ static bool qt_isect_curve_horizontal(const QBezier &bezier, qreal y, qreal x1, if (y >= bounds.top() && y < bounds.bottom() && bounds.right() >= x1 && bounds.left() < x2) { const qreal lower_bound = qreal(.01); - if (depth == 32 || bounds.width() < lower_bound && bounds.height() < lower_bound) + if (depth == 32 || (bounds.width() < lower_bound && bounds.height() < lower_bound)) return true; QBezier first_half, second_half; @@ -1923,7 +1923,7 @@ static bool qt_isect_curve_vertical(const QBezier &bezier, qreal x, qreal y1, qr if (x >= bounds.left() && x < bounds.right() && bounds.bottom() >= y1 && bounds.top() < y2) { const qreal lower_bound = qreal(.01); - if (depth == 32 || bounds.width() < lower_bound && bounds.height() < lower_bound) + if (depth == 32 || (bounds.width() < lower_bound && bounds.height() < lower_bound)) return true; QBezier first_half, second_half; |