From f10a3a1008c2ccbfbdf7f3e0cfe6af34c8a7db9c Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
Date: Mon, 11 Jan 2010 17:52:31 +0200
Subject: Fix for QTBUG-7267 Qs60Style::drawControl() does not align
 CE_ItemViewItem control element correctly if given widget is null.

Uses now alignment hint value given in style option.

Task-number: QTBUG-7267
Reviewed-by: Janne Koskinen
---
 src/gui/styles/qs60style.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index bcc993a..d78ea21 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -1363,7 +1363,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
                 }
             }
 
-            int rightValue = widget ? widget->contentsRect().right() : 0;
+            int rightValue = widget ? widget->contentsRect().right() : voptAdj.rect.right();
 
             if (isScrollBarVisible)
                 rightValue -= scrollBarWidth;
-- 
cgit v0.12