File: Prevent-explicitly-setting-default-font.patch

package info (click to toggle)
linphone-desktop 5.2.6%2Bdfsg-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 14,832 kB
  • sloc: cpp: 32,911; javascript: 1,684; sh: 319; makefile: 38
file content (29 lines) | stat: -rw-r--r-- 1,312 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
From: Bastian Germann <bage@debian.org>
Date: Tue, 4 Mar 2025 20:09:05 +0100
Subject: Prevent explicitly setting default font

Works around:
error: ‘class App’ has no member named ‘setFont’
mApp->setFont(QFont(Constants::DefaultFont));
---
--- a/linphone-app/src/app/AppController.cpp
+++ b/linphone-app/src/app/AppController.cpp
@@ -102,7 +102,6 @@ AppController::AppController (int &argc, char *argv[]) {
 	}
 	qInfo() << "Available fonts : " << QFontDatabase().families();
 	
-	mApp->setFont(QFont(Constants::DefaultFont));
 }
 
 AppController::~AppController () {
--- a/linphone-app/src/components/settings/SettingsModel.cpp
+++ b/linphone-app/src/components/settings/SettingsModel.cpp
@@ -1559,7 +1559,7 @@ TunnelModel* SettingsModel::getTunnel() const{
 // =============================================================================
 
 QFont SettingsModel::getTextMessageFont() const{
-	QString family = Utils::coreStringToAppString(mConfig->getString(UiSection, "text_message_font", Utils::appStringToCoreString(App::getInstance()->font().family())));
+	QString family = Utils::coreStringToAppString(mConfig->getString(UiSection, "text_message_font", Utils::appStringToCoreString(QApplication::font().family())));
 	int pointSize = getTextMessageFontSize();
 	return QFont(family,pointSize);
 }