sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Juergen E. Fischer 2012-02-02 09:27:34 +01:00
parent 49429c0456
commit 6ba79cafb8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/composer/qgscomposerlabelwidget.cpp
View File

@ -55,9 +55,9 @@ void QgsComposerLabelWidget::on_mFontButton_clicked()
bool ok; bool ok;
#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA) #if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
// Native Mac dialog works only for Qt Carbon // 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 #else
QFont newFont = QFontDialog::getFont( &ok, mComposerLabel->font(), this ); QFont newFont = QFontDialog::getFont( &ok, mComposerLabel->font() );
#endif #endif
if ( ok ) if ( ok )
{ {