hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 21:04:09 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge pull request #67 from xiaoyifang/staged

Browse source 
fix:font family compile error on qt5.15.2
This commit is contained in:
xiaoyifang 2022-05-08 17:24:33 +08:00 committed by GitHub
parent 9d10ca5c2f 368724dde3
commit 3efaf8c1e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
preferences.cc
View file

@ -94,8 +94,12 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
prevInterfaceLanguage = x; prevInterfaceLanguage = x;
break; break;
} }
#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
const QStringList fontFamilies = QFontDatabase::families(); const QStringList fontFamilies = QFontDatabase::families();
#else
QFontDatabase fontDb;
const QStringList fontFamilies = fontDb.families();
#endif
for( const QString & family : fontFamilies ) for( const QString & family : fontFamilies )
{ {
ui.fontFamilies->addItem( family ); ui.fontFamilies->addItem( family );