Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
	mkspecs/common/symbian/symbian.conf
	qmake/generators/symbian/symmake.cpp
	src/3rdparty/webkit/WebCore/WebCore.pro

3 files changed, 18 insertions, 6 deletions

diff --git a/util/s60pixelmetrics/pixel_metrics.cpp b/util/s60pixelmetrics/pixel_metrics.cpp
index beb785e45c..814e185fd4 100644
--- a/util/s60pixelmetrics/pixel_metrics.cpp
+++ b/util/s60pixelmetrics/pixel_metrics.cpp
@@ -50,7 +50,7 @@
 // so that we can keep dynamic and static values inline.
 // Please adjust version data if correcting dynamic PM calculations.
 const TInt KPMMajorVersion = 1;
-const TInt KPMMinorVersion = 16;
+const TInt KPMMinorVersion = 17;
 
 TPixelMetricsVersion PixelMetrics::Version()
     {
@@ -869,7 +869,7 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
             // The difference of center piece from border tell the frame width.
             if ( value == QStyle::PM_FocusFrameHMargin)
                 {
-				//use topleft for horizontal as S60 uses different values for right and left borders
+                 //use topleft for horizontal as S60 uses different values for right and left borders
                  value = listSinglePaneText.TextRect().iTl.iX - highlightRect.Rect().iTl.iX;
                 }
             else
@@ -1003,6 +1003,13 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
         case QStyle::PM_Custom_ThinLineWidth:
             value = 1;
             break;
+        case QStyle::PM_Custom_MessageBoxHeight:
+            {
+            TAknLayoutRect popupRect;
+            popupRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::popup_window_general(0));
+            value = popupRect.Rect().Height();
+            }
+            break;
         case QStyle::PM_ButtonShiftHorizontal:
         case QStyle::PM_ButtonShiftVertical:
             value = 0;
diff --git a/util/s60pixelmetrics/pixel_metrics.h b/util/s60pixelmetrics/pixel_metrics.h
index 3536c0e14b..4b0f57ed5f 100644
--- a/util/s60pixelmetrics/pixel_metrics.h
+++ b/util/s60pixelmetrics/pixel_metrics.h
@@ -185,7 +185,9 @@ NONSHARABLE_CLASS( QStyle )
             // Bold line width
             PM_Custom_BoldLineWidth,
             // Thin line width
-            PM_Custom_ThinLineWidth
+            PM_Custom_ThinLineWidth,
+            // Height of a popup info messagebox
+            PM_Custom_MessageBoxHeight
         };
 
     };
diff --git a/util/s60pixelmetrics/pm_mapperapp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp
index acc6137c7b..a88499da29 100644
--- a/util/s60pixelmetrics/pm_mapperapp.cpp
+++ b/util/s60pixelmetrics/pm_mapperapp.cpp
@@ -155,7 +155,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
             Exit();
             break;
         case ECmdSwitchOutput:
-		    {
+            {
             HBufC* buffer = HBufC::NewLC( 100 );
             TPtr bufferPtr = buffer->Des();
             TBool last = ETrue;
@@ -166,7 +166,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
             else
                 bufferPtr.Append(_L("screen."));
             ShowL( *buffer, last );
-			}
+            }
             break;
         case ECmdStatus:
             {
@@ -323,7 +323,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
             TInt myValue = KErrNotFound;
             for (;;)
                 {
-                if (index==QStyle::PM_Custom_ThinLineWidth)
+                if (index==QStyle::PM_Custom_MessageBoxHeight)
                     {
                     last = ETrue;
                     }
@@ -656,6 +656,9 @@ void CPixelMetricsMapperAppUi::ShowSingleValueL(TInt& aPixelMetric, TInt& aValue
         case QStyle::PM_Custom_BoldLineWidth:
             bufferPtr.Append(_L("C_BoldLineWidth: "));
             break;
+        case QStyle::PM_Custom_MessageBoxHeight:
+            bufferPtr.Append(_L("C_MsgBoxHeight: "));
+            break;
         default:
             bufferPtr.Append(_L("Default: "));
             break;