Compile fixes for clang10

Fix some warnings that are flagged as errors on clang10.

Change-Id: I906634c8b2bd94db42d74a7f3d10efb086e373cc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 32fbd8cfed..7712ce71c6 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -609,10 +609,10 @@ Q_GUI_EXPORT void qt_addBitmapToPath(qreal x0, qreal y0, const uchar *image_data
     // set up edges
     for (int y = 0; y <= h; ++y) {
         for (int x = 0; x <= w; ++x) {
-            bool topLeft = (x == 0)|(y == 0) ? false : SET(x - 1, y - 1);
-            bool topRight = (x == w)|(y == 0) ? false : SET(x, y - 1);
-            bool bottomLeft = (x == 0)|(y == h) ? false : SET(x - 1, y);
-            bool bottomRight = (x == w)|(y == h) ? false : SET(x, y);
+            bool topLeft = (x == 0 || y == 0) ? false : SET(x - 1, y - 1);
+            bool topRight = (x == w || y == 0) ? false : SET(x, y - 1);
+            bool bottomLeft = (x == 0 || y == h) ? false : SET(x - 1, y);
+            bool bottomRight = (x == w || y == h) ? false : SET(x, y);
 
             GRID(x, y) = 0;
             if ((!topRight) & bottomRight)