diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-11 09:59:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-12 08:43:00 +0200 |
| commit | 3a1a38b0d7a6dd83d4a1e3d0ba4090927e881236 (patch) | |
| tree | 9d613250825cca79e7538856ccd58f0cf9029f49 | |
| parent | 9b8b1ca4a076bea8077357702ee4353299b1c183 (diff) | |
Fix CLANG-warning '&&' within '||' [-Wlogical-op-parentheses].
Change-Id: Id724c86f87a78048df9b93f2d190593d36261943
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 39bdb90f62..ccc9fe36c8 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; |