Skip to content
Permalink
Browse files

don't set parent of QFontDialog (fixes #4937, but makes it not follow…

… the globally set font size)
  • Loading branch information
jef-n committed Feb 2, 2012
1 parent 49429c0 commit 6ba79cafb85162eafa883ed9b7b56a629877f44a
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/app/composer/qgscomposerlabelwidget.cpp
@@ -55,9 +55,9 @@ void QgsComposerLabelWidget::on_mFontButton_clicked()
bool ok;
#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
// Native Mac dialog works only for Qt Carbon
QFont newFont = QFontDialog::getFont( &ok, mComposerLabel->font(), this, QString(), QFontDialog::DontUseNativeDialog );
QFont newFont = QFontDialog::getFont( &ok, mComposerLabel->font(), 0, QString(), QFontDialog::DontUseNativeDialog );
#else
QFont newFont = QFontDialog::getFont( &ok, mComposerLabel->font(), this );
QFont newFont = QFontDialog::getFont( &ok, mComposerLabel->font() );
#endif
if ( ok )
{

0 comments on commit 6ba79ca

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