don't set parent of QFontDialog (fixes #4937, but makes it not follow the globally set font size)

jef-n · jef-n · commit 6ba79cafb851 · 2012-02-02T09:27:34.000+01:00
diff --git a/src/app/composer/qgscomposerlabelwidget.cpp b/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 )
     {
