review.tizen.org Git - platform/upstream/qtdeclarative.git/commit

author	Erik Verbruggen <erik.verbruggen@me.com>
	Wed, 26 Jun 2013 10:31:06 +0000 (12:31 +0200)
committer	The Qt Project <gerrit-noreply@qt-project.org>
	Tue, 2 Jul 2013 18:57:52 +0000 (20:57 +0200)
commit	adc66d86f17b1c781b90ab30ad7382f0f3879c18
tree	42b4273358ac99397a8ffa13dbadf501ac3e8ccd	tree \| snapshot
parent	2ba188dce0d04a7f53ba5ef89f1fcf16cfcdde42	commit \| diff

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 <lars.knoll@digia.com>