fix #4993

jef-n · jef-n · commit 7cea2f52beea · 2012-02-21T09:42:38.000+01:00
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -658,7 +658,7 @@ void QgsComposerMapWidget::on_mAnnotationFontButton_clicked()
   // Native Mac dialog works only for Qt Carbon
   QFont newFont = QFontDialog::getFont( &ok, mComposerMap->gridAnnotationFont(), this, QString(), QFontDialog::DontUseNativeDialog );
 #else
-  QFont newFont = QFontDialog::getFont( &ok, mComposerMap->gridAnnotationFont(), this );
+  QFont newFont = QFontDialog::getFont( &ok, mComposerMap->gridAnnotationFont() );
 #endif
   if ( ok )
   {

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ void QgsComposerMapWidget::on_mAnnotationFontButton_clicked()`
`658`	`658`	`// Native Mac dialog works only for Qt Carbon`
`659`	`659`	`QFont newFont = QFontDialog::getFont( &ok, mComposerMap->gridAnnotationFont(), this, QString(), QFontDialog::DontUseNativeDialog );`
`660`	`660`	`#else`
`661`		`- QFont newFont = QFontDialog::getFont( &ok, mComposerMap->gridAnnotationFont(), this );`
	`661`	`+ QFont newFont = QFontDialog::getFont( &ok, mComposerMap->gridAnnotationFont() );`
`662`	`662`	`#endif`
`663`	`663`	`if ( ok )`
`664`	`664`	`{`