summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-01-13 11:55:10 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-13 12:28:31 +0100
commitbb9fd68ea7555d74ed7e7ba3b76f9cb6674cd601 (patch)
treede6d59770cabaff6ac7d25a6c28e56ce67dcbe73
parentd9b5e704591571618c592564dc19a95d5e80f2c6 (diff)
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<Qt::AlignmentFlag>' and 'int') if ((alignment & Qt::AlignAbsolute) == 0 && (alignment & (Qt::AlignLeft | Qt::AlignRight))) { Initial-patch-by: BogDan Vatra <bogdan@kde.org> Change-Id: I560b5c4c1db59da6f2a5e1e05c32a31f8e1dac22 Reviewed-by: BogDan Vatra <bogdan@kde.org>
-rw-r--r--src/gui/kernel/qguiapplication_p.h2
1 files changed, 1 insertions, 1 deletions
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;