diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-04-08 23:58:18 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-04-13 12:04:06 (GMT) |
| commit | 39aa998e08be078aad5fd45b827c15fc04eb8e51 (patch) | |
| tree | d54243a351bfddfaec9fdc79bde3d9cd8cf784fc | |
| parent | 0dc9c8eb8535b1a678360e4d3183f0b1b5e79db3 (diff) | |
| download | Qt-39aa998e08be078aad5fd45b827c15fc04eb8e51.zip Qt-39aa998e08be078aad5fd45b827c15fc04eb8e51.tar.gz Qt-39aa998e08be078aad5fd45b827c15fc04eb8e51.tar.bz2 | |
Fix warnings about && inside ||
Reviewed-By: Trust Me
| -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; |