--- a/src/hbcore/primitives/hbtextitem.cpp Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbcore/primitives/hbtextitem.cpp Fri Sep 17 08:32:10 2010 +0300
@@ -517,7 +517,7 @@
Below flag detects platform which have this problem to activate work-around.
*/
#if defined(Q_OS_SYMBIAN) && defined(Q_BIG_ENDIAN)
-# warning Work-around is active in fade effect of HbTextItem (see comment)
+//# warning Work-around is active in fade effect of HbTextItem (see comment)
# define HB_FADE_EFFECT_WORKAROUND_ON_PHONE
#endif
inline void HbTextItemPrivate::setPainterPen(QPainter *painter,
@@ -1072,7 +1072,7 @@
{
Q_D(HbTextItem);
d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign, true);
- alignment &= Qt::AlignVertical_Mask | Qt::AlignHorizontal_Mask;
+ alignment = d->combineAlignment(alignment, d->mAlignment);
if (d->mAlignment != alignment) {
prepareGeometryChange();
d->mAlignment = alignment;