From 4495bb0f1f46ce242a3f27be4381210c7a9b033b Mon Sep 17 00:00:00 2001
From: zeljko <zeljko@lazarus-ide.org>
Date: Sun, 11 Dec 2011 19:20:12 +0000
Subject: [PATCH] Qt: use averageCharWidth under MaxOSX with Qt >= 4.6

git-svn-id: trunk@34116 -
---
 lcl/interfaces/qt/qtwinapi.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lcl/interfaces/qt/qtwinapi.inc b/lcl/interfaces/qt/qtwinapi.inc
index e7a91503b5..1637e9fd49 100644
--- a/lcl/interfaces/qt/qtwinapi.inc
+++ b/lcl/interfaces/qt/qtwinapi.inc
@@ -4155,7 +4155,10 @@ begin
     {this is due qt bug in fontmetrics::averageCharWidth() under Mac
      http://trolltech.com/developer/task-tracker/index_html?method=entry&id=169440 }
     {$IFDEF DARWIN}
-    TM.tmAveCharWidth := QtFontMetrics.charWidth('x',0);
+    if (QtVersionMajor = 4) and (QtVersionMinor >= 6) then
+      TM.tmAveCharWidth := QtFontMetrics.averageCharWidth
+    else
+      TM.tmAveCharWidth := QtFontMetrics.charWidth('x',0);
     {$ELSE}
     TM.tmAveCharWidth := QtFontMetrics.averageCharWidth;
     {$ENDIF}