AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qguiapplication_p.h: Compile fix for Android.

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2014-01-13 11:55:10 +01:00 committed by The Qt Project
parent d9b5e70459
commit bb9fd68ea7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qguiapplication_p.h
View File

@ -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;