kdelibs4support--

kmcommands.cpp

@@ -148,6 +148,7 @@ using namespace KMime;
 #include <algorithm>
 #include <memory>
 #include <QStandardPaths>
+#include <QFontDatabase>
 
 
 using namespace MailCommon;
@@ -1081,7 +1082,7 @@ KMPrintCommand::KMPrintCommand(QWidget *parent, const Akonadi::Item &msg,
 {
     fetchScope().fetchFullPayload( true );
     if ( MessageCore::GlobalSettings::useDefaultFonts() )
-        mOverrideFont = KGlobalSettings::generalFont();
+        mOverrideFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
     else {
         mOverrideFont = MessageCore::GlobalSettings::self()->printFont();
     }

kmsystemtray.cpp

@@ -42,6 +42,7 @@
 #include <AkonadiCore/ChangeRecorder>
 #include <AkonadiCore/EntityTreeModel>
 #include <AkonadiCore/CollectionModel>
+#include <QFontDatabase>
 
 using namespace MailCommon;
 
@@ -210,7 +211,7 @@ void KMSystemTray::updateCount()
         const int overlaySize = KIconLoader::SizeSmallMedium;
 
         const QString countString = QString::number( mCount );
-        QFont countFont = KGlobalSettings::generalFont();
+        QFont countFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
         countFont.setBold(true);
 
         // decrease the size of the font for the number of unread messages if the