From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 11 Jul 2013 07:59:03 +0000 (+0200)
Subject: Fix CLANG-warning  '&&' within '||' [-Wlogical-op-parentheses].
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=3a1a38b0d7a6dd83d4a1e3d0ba4090927e881236;p=konrad%2Fqtdeclarative.git

Fix CLANG-warning  '&&' within '||' [-Wlogical-op-parentheses].

Change-Id: Id724c86f87a78048df9b93f2d190593d36261943
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
---

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 39bdb90..ccc9fe3 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -2160,7 +2160,7 @@ void QQuickText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeo
         goto geomChangeDone;
 
     if ((effectiveHAlign() != QQuickText::AlignLeft && widthChanged)
-            || vAlign() != QQuickText::AlignTop && heightChanged) {
+            || (vAlign() != QQuickText::AlignTop && heightChanged)) {
         // If the width has changed and we're not left aligned do an update so the text is
         // repositioned even if a full layout isn't required. And the same for vertical.
         d->updateType = QQuickTextPrivate::UpdatePaintNode;