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

… the globally set font size)
qgis · Feb 2, 2012 · 6ba79ca · 6ba79ca
1 parent 49429c0
commit 6ba79ca
Showing 1 changed file with 2 additions and 2 deletions.
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 )
     {