From 1ea1f0ebc5216683de47daf78b77b2e198931270 Mon Sep 17 00:00:00 2001 From: telwertowski Date: Thu, 6 Aug 2009 01:47:36 +0000 Subject: [PATCH] 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. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11280 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/app/qgslabeldialog.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/qgslabeldialog.cpp b/src/app/qgslabeldialog.cpp index e44dceaade13..103f5204ad0b 100644 --- a/src/app/qgslabeldialog.cpp +++ b/src/app/qgslabeldialog.cpp @@ -275,7 +275,12 @@ void QgsLabelDialog::changeFont( void ) 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 )