Skip to content

Commit 2cb0605

Browse files
author
telwertowski
committedAug 6, 2009
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
1 parent 669b694 commit 2cb0605

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed
 

‎src/app/qgslabeldialog.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,12 @@ void QgsLabelDialog::changeFont( void )
275275

276276
qreal fontSize = mFont.pointSizeF();
277277
bool resultFlag;
278+
#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && !defined(__LP64__)
279+
// Native Mac dialog works only for 64 bit Cocoa (observed in Qt 4.5.2, probably a Qt bug)
280+
mFont = QFontDialog::getFont( &resultFlag, mFont, this, QString(), QFontDialog::DontUseNativeDialog );
281+
#else
278282
mFont = QFontDialog::getFont( &resultFlag, mFont, this );
283+
#endif
279284
if ( resultFlag )
280285
{
281286
if ( mFont.pointSizeF() != fontSize )

0 commit comments

Comments
 (0)
Please sign in to comment.