Skip to content
Permalink
Browse files

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@11280 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
telwertowski
telwertowski committed Aug 6, 2009
1 parent 669b694 commit 2cb060569d39a86cce7946dc8ecd13d34b0976ab
Showing with 5 additions and 0 deletions.
  1. +5 −0 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 )

0 comments on commit 2cb0605

Please sign in to comment.
You can’t perform that action at this time.