[QGIS Commit] r11280 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: telwertowski
Date: 2009-08-05 21:47:36 -0400 (Wed, 05 Aug 2009)
New Revision: 11280

Modified:
   trunk/qgis/src/app/qgslabeldialog.cpp
Log:
For 32-bit Mac builds, use traditional non-native Qt font dialog. The new Qt 4.5 native implementation was added to support 64-bit builds and appears not to have been extensively tested for backward compatibility.


Modified: trunk/qgis/src/app/qgslabeldialog.cpp
===================================================================
--- trunk/qgis/src/app/qgslabeldialog.cpp	2009-08-05 21:45:29 UTC (rev 11279)
+++ trunk/qgis/src/app/qgslabeldialog.cpp	2009-08-06 01:47:36 UTC (rev 11280)
@@ -275,7 +275,12 @@
 
   qreal fontSize = mFont.pointSizeF();
   bool resultFlag;
+#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && !defined(__LP64__)
+  // Native Mac dialog works only for 64 bit Cocoa (observed in Qt 4.5.2, probably a Qt bug)
+  mFont = QFontDialog::getFont( &resultFlag, mFont, this, QString(), QFontDialog::DontUseNativeDialog );
+#else
   mFont = QFontDialog::getFont( &resultFlag, mFont, this );
+#endif
   if ( resultFlag )
   {
     if ( mFont.pointSizeF() != fontSize )