From adc66d86f17b1c781b90ab30ad7382f0f3879c18 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Wed, 26 Jun 2013 12:31:06 +0200 Subject: [PATCH] Fix warning from clang. items/qquicktext.cpp:2160:49: warning: '&&' within '||' [-Wlogical-op-parentheses] || vAlign() != QQuickText::AlignTop && heightChanged) { ~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~ items/qquicktext.cpp:2160:49: note: place parentheses around the '&&' expression to silence this warning || vAlign() != QQuickText::AlignTop && heightChanged) { ^ ( ) Change-Id: Id4bc18642228e7fad6d674bbcdf623446bb6a00f Reviewed-by: Lars Knoll --- src/quick/items/qquicktext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index cc2cbb3..37a0c8e 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2157,7 +2157,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; -- 2.7.4