From bb9fd68ea7555d74ed7e7ba3b76f9cb6674cd601 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 13 Jan 2014 11:55:10 +0100 Subject: [PATCH] qguiapplication_p.h: Compile fix for Android. In file included from qguiapplication_p.h:1:0, from src/qandroidplatformdialoghelpers.cpp:46: src/gui/kernel/qguiapplication_p.h: In static member function 'static Qt::Alignment QGuiApplicationPrivate::visualAlignment(Qt::LayoutDirection, Qt::Alignment)': src/gui/kernel/qguiapplication_p.h:171:45: error: ambiguous overload for 'operator==' (operand types are 'QFlags' and 'int') if ((alignment & Qt::AlignAbsolute) == 0 && (alignment & (Qt::AlignLeft | Qt::AlignRight))) { Initial-patch-by: BogDan Vatra Change-Id: I560b5c4c1db59da6f2a5e1e05c32a31f8e1dac22 Reviewed-by: BogDan Vatra --- src/gui/kernel/qguiapplication_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index b158138bb7..c241ad7a22 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -168,7 +168,7 @@ public: { if (!(alignment & Qt::AlignHorizontal_Mask)) alignment |= Qt::AlignLeft; - if ((alignment & Qt::AlignAbsolute) == 0 && (alignment & (Qt::AlignLeft | Qt::AlignRight))) { + if (!(alignment & Qt::AlignAbsolute) && (alignment & (Qt::AlignLeft | Qt::AlignRight))) { if (direction == Qt::RightToLeft) alignment ^= (Qt::AlignLeft | Qt::AlignRight); alignment |= Qt::AlignAbsolute;