mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-17 20:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert Qt6.10 changes for MacOS compatibility (Qt 6.10 needs MacOS 13 or later)

Browse source 
=> use Qt6.8 as minimum version for long time support
This commit is contained in:
Gaelle Braud 2026-02-09 12:15:34 +01:00
parent e83cc16a47
commit 38ff5ba7cd
10 changed files with 87 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/CMakeLists.txt
View file

@ -96,8 +96,8 @@ else()
set(MSPLUGINS_DIR "${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins")
endif()
if(${Qt6_VERSION} VERSION_LESS "6.10.0")
message( FATAL_ERROR "Linphone requires Qt 6.10.0 or newer. Exiting CMake." )
if(${Qt6_VERSION} VERSION_LESS "6.8.0")
message( FATAL_ERROR "Linphone requires Qt 6.8.0 or newer. Exiting CMake." )
endif()
qt6_standard_project_setup()

6
Linphone/core/App.cpp
View file

@ -515,14 +515,16 @@ void App::setSelf(QSharedPointer<App>(me)) {
case linphone::VersionUpdateCheckResult::NewVersionAvailable: {
QString downloadLink =
QStringLiteral("<a href='%1'><font color='DefaultStyle.main2_600'>%2</a>")
.arg(url)
.arg(Utils::coreStringToAppString(url))
//: Download it !
.arg(tr("info_popup_new_version_download_label"));
Utils::showInformationPopup(
//: New version available !
tr("info_popup_new_version_available_title"),
//: A new version of Linphone (%1) is available. %2
tr("info_popup_new_version_available_message").arg(version).arg(downloadLink));
tr("info_popup_new_version_available_message")
.arg(Utils::coreStringToAppString(version))
.arg(downloadLink));
break;
}
case linphone::VersionUpdateCheckResult::UpToDate:

2
Linphone/core/proxy/SortFilterProxy.cpp
View file

@ -109,6 +109,6 @@ void SortFilterProxy::invalidateFilter() {
QSortFilterProxyModel::beginFilterChange();
QSortFilterProxyModel::endFilterChange();
#else
invalidateFilter();
QSortFilterProxyModel::invalidateFilter();
#endif
}

40
Linphone/data/languages/de.ts
View file

@ -31,7 +31,7 @@
<translation>Telefonnummer oder SIP-Adresse wählen</translation>
</message>
<message>
<location filename="../../view/Page/Window/AbstractWindow.qml" line="331"/>
<location filename="../../view/Page/Window/AbstractWindow.qml" line="329"/>
<source>fps_counter</source>
<translation>%1 FPS</translation>
</message>
@ -682,14 +682,14 @@
<message>
<location filename="../../core/App.cpp" line="432"/>
<location filename="../../core/App.cpp" line="510"/>
<location filename="../../core/App.cpp" line="801"/>
<location filename="../../core/App.cpp" line="803"/>
<source>info_popup_error_title</source>
<extracomment>Error</extracomment>
<translation>Fehler</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="433"/>
<location filename="../../core/App.cpp" line="803"/>
<location filename="../../core/App.cpp" line="805"/>
<source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment>
<translation>Remote-Provisionierung fehlgeschlagen: %1</translation>
@ -718,97 +718,97 @@
<translation>Eine neue Version von Linphone (%1) ist unter %1 verfügbar</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="531"/>
<location filename="../../core/App.cpp" line="533"/>
<source>info_popup_version_up_to_date_title</source>
<translation>Auf dem neuesten Stand</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="533"/>
<location filename="../../core/App.cpp" line="535"/>
<source>info_popup_version_up_to_date_message</source>
<extracomment>Your version is up to date</extracomment>
<translation>Ihre Version ist auf dem neuesten Stand</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="797"/>
<location filename="../../core/App.cpp" line="799"/>
<source>configuration_error_detail</source>
<extracomment>not reachable</extracomment>
<translation>nicht erreichbar</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1090"/>
<location filename="../../core/App.cpp" line="1092"/>
<source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>Ein kostenloses Open-Source SIP Video-Telefon.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1092"/>
<location filename="../../core/App.cpp" line="1094"/>
<source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Kommandozeilen-Befehl an die Anwendung schicken</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1096"/>
<location filename="../../core/App.cpp" line="1098"/>
<source>command_line_option_show_help</source>
<translation>Zeige Hilfe</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1101"/>
<location filename="../../core/App.cpp" line="1103"/>
<source>command_line_option_show_app_version</source>
<translation>App-Version anzeigen</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1109"/>
<location filename="../../core/App.cpp" line="1111"/>
<source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Abzurufende Linphone-Konfigurationsdatei angeben. Sie wird mit der aktuellen Konfiguration zusammengeführt.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1111"/>
<location filename="../../core/App.cpp" line="1113"/>
<source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, Pfad oder Datei</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1116"/>
<location filename="../../core/App.cpp" line="1118"/>
<source>command_line_option_minimized</source>
<translation>Minimieren</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1119"/>
<location filename="../../core/App.cpp" line="1121"/>
<source>command_line_option_log_to_stdout</source>
<translation>Debug-Informationen auf der Standardausgabe ausgeben</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1122"/>
<location filename="../../core/App.cpp" line="1124"/>
<source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Nur Anwendungs-Logs ausgeben</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1589"/>
<location filename="../../core/App.cpp" line="1591"/>
<source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Ausblenden</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1589"/>
<location filename="../../core/App.cpp" line="1591"/>
<source>show_action</source>
<translation>Zeigen</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1604"/>
<location filename="../../core/App.cpp" line="1606"/>
<source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment>
<translation>Beenden</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1622"/>
<location filename="../../core/App.cpp" line="1624"/>
<source>check_for_update</source>
<extracomment>Check for update</extracomment>
<translation>Auf Updates prüfen</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1749"/>
<location filename="../../core/App.cpp" line="1751"/>
<source>mark_all_read_action</source>
<translation>Alle als gelesen markieren</translation>
</message>

40
Linphone/data/languages/en.ts
View file

@ -31,7 +31,7 @@
<translation>Choose a SIP number or address</translation>
</message>
<message>
<location filename="../../view/Page/Window/AbstractWindow.qml" line="331"/>
<location filename="../../view/Page/Window/AbstractWindow.qml" line="329"/>
<source>fps_counter</source>
<translation>%1 FPS</translation>
</message>
@ -663,14 +663,14 @@
<message>
<location filename="../../core/App.cpp" line="432"/>
<location filename="../../core/App.cpp" line="510"/>
<location filename="../../core/App.cpp" line="801"/>
<location filename="../../core/App.cpp" line="803"/>
<source>info_popup_error_title</source>
<extracomment>Error</extracomment>
<translation>Error</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="433"/>
<location filename="../../core/App.cpp" line="803"/>
<location filename="../../core/App.cpp" line="805"/>
<source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment>
<translation>Remote provisioning failed : %1</translation>
@ -699,97 +699,97 @@
<translation>A new version of Linphone (%1) is available at %1</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="531"/>
<location filename="../../core/App.cpp" line="533"/>
<source>info_popup_version_up_to_date_title</source>
<translation>Up to date</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="533"/>
<location filename="../../core/App.cpp" line="535"/>
<source>info_popup_version_up_to_date_message</source>
<extracomment>Your version is up to date</extracomment>
<translation>Up to date Your version is up to date</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="797"/>
<location filename="../../core/App.cpp" line="799"/>
<source>configuration_error_detail</source>
<extracomment>not reachable</extracomment>
<translation>not reachable</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1090"/>
<location filename="../../core/App.cpp" line="1092"/>
<source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>A free and open source SIP video-phone.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1092"/>
<location filename="../../core/App.cpp" line="1094"/>
<source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Send an order to the application towards a command line</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1096"/>
<location filename="../../core/App.cpp" line="1098"/>
<source>command_line_option_show_help</source>
<translation>Show this help</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1101"/>
<location filename="../../core/App.cpp" line="1103"/>
<source>command_line_option_show_app_version</source>
<translation>Show app version</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1109"/>
<location filename="../../core/App.cpp" line="1111"/>
<source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1111"/>
<location filename="../../core/App.cpp" line="1113"/>
<source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, path or file</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1116"/>
<location filename="../../core/App.cpp" line="1118"/>
<source>command_line_option_minimized</source>
<translation>Minimize</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1119"/>
<location filename="../../core/App.cpp" line="1121"/>
<source>command_line_option_log_to_stdout</source>
<translation>Log to stdout some debug information while running</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1122"/>
<location filename="../../core/App.cpp" line="1124"/>
<source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Print only logs from the application</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1589"/>
<location filename="../../core/App.cpp" line="1591"/>
<source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Hide</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1589"/>
<location filename="../../core/App.cpp" line="1591"/>
<source>show_action</source>
<translation>Show</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1604"/>
<location filename="../../core/App.cpp" line="1606"/>
<source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment>
<translation>Quit</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1622"/>
<location filename="../../core/App.cpp" line="1624"/>
<source>check_for_update</source>
<extracomment>Check for update</extracomment>
<translation>Check for update</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1749"/>
<location filename="../../core/App.cpp" line="1751"/>
<source>mark_all_read_action</source>
<translation>Marquer tout comme lu</translation>
</message>

40
Linphone/data/languages/fr.ts
View file

@ -31,7 +31,7 @@
<translation>Choisissez un numéro ou adresse SIP</translation>
</message>
<message>
<location filename="../../view/Page/Window/AbstractWindow.qml" line="331"/>
<location filename="../../view/Page/Window/AbstractWindow.qml" line="329"/>
<source>fps_counter</source>
<translation>%1 FPS</translation>
</message>
@ -658,14 +658,14 @@
<message>
<location filename="../../core/App.cpp" line="432"/>
<location filename="../../core/App.cpp" line="510"/>
<location filename="../../core/App.cpp" line="801"/>
<location filename="../../core/App.cpp" line="803"/>
<source>info_popup_error_title</source>
<extracomment>Error</extracomment>
<translation>Erreur</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="433"/>
<location filename="../../core/App.cpp" line="803"/>
<location filename="../../core/App.cpp" line="805"/>
<source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment>
<translation>La configuration distante a échoué : %1</translation>
@ -694,97 +694,97 @@
<translation>Une nouvelle version de Linphone (%1) est disponible. %2</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="531"/>
<location filename="../../core/App.cpp" line="533"/>
<source>info_popup_version_up_to_date_title</source>
<translation>À jour</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="533"/>
<location filename="../../core/App.cpp" line="535"/>
<source>info_popup_version_up_to_date_message</source>
<extracomment>Your version is up to date</extracomment>
<translation>Votre version est à jour</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="797"/>
<location filename="../../core/App.cpp" line="799"/>
<source>configuration_error_detail</source>
<extracomment>not reachable</extracomment>
<translation>indisponible</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1090"/>
<location filename="../../core/App.cpp" line="1092"/>
<source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>A free and open source SIP video-phone.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1092"/>
<location filename="../../core/App.cpp" line="1094"/>
<source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Send an order to the application towards a command line</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1096"/>
<location filename="../../core/App.cpp" line="1098"/>
<source>command_line_option_show_help</source>
<translation>Show this help</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1101"/>
<location filename="../../core/App.cpp" line="1103"/>
<source>command_line_option_show_app_version</source>
<translation>Afficher la version de l&apos;application</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1109"/>
<location filename="../../core/App.cpp" line="1111"/>
<source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1111"/>
<location filename="../../core/App.cpp" line="1113"/>
<source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, path or file</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1116"/>
<location filename="../../core/App.cpp" line="1118"/>
<source>command_line_option_minimized</source>
<translation>Minimiser</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1119"/>
<location filename="../../core/App.cpp" line="1121"/>
<source>command_line_option_log_to_stdout</source>
<translation>Log to stdout some debug information while running</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1122"/>
<location filename="../../core/App.cpp" line="1124"/>
<source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Print only logs from the application</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1589"/>
<location filename="../../core/App.cpp" line="1591"/>
<source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Cacher</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1589"/>
<location filename="../../core/App.cpp" line="1591"/>
<source>show_action</source>
<translation>Afficher</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1604"/>
<location filename="../../core/App.cpp" line="1606"/>
<source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment>
<translation>Quitter</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1622"/>
<location filename="../../core/App.cpp" line="1624"/>
<source>check_for_update</source>
<extracomment>Check for update</extracomment>
<translation>Rechercher une mise à jour</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1749"/>
<location filename="../../core/App.cpp" line="1751"/>
<source>mark_all_read_action</source>
<translation>Marquer tout comme lu</translation>
</message>

8
Linphone/view/Page/Main/Call/CallPage.qml
View file

@ -137,11 +137,11 @@ AbstractMainPage {
ColumnLayout {
anchors.fill: parent
spacing: 0
FlexboxLayout {
RowLayout {
id: titleCallLayout
direction: FlexboxLayout.Row
gap: Utils.getSizeWithScreenRatio(16)
alignItems: FlexboxLayout.AlignCenter
// direction: FlexboxLayout.Row
spacing: Utils.getSizeWithScreenRatio(16)
// alignItems: FlexboxLayout.AlignCenter
Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
Layout.fillHeight: false
Text {

8
Linphone/view/Page/Main/Chat/ChatPage.qml
View file

@ -119,10 +119,10 @@ AbstractMainPage {
ColumnLayout {
anchors.fill: parent
spacing: 0
FlexboxLayout {
direction: FlexboxLayout.Row
gap: Utils.getSizeWithScreenRatio(16)
alignItems: FlexboxLayout.AlignCenter
RowLayout {
// direction: FlexboxLayout.Row
// alignItems: FlexboxLayout.AlignCenter
spacing: Utils.getSizeWithScreenRatio(16)
Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
Layout.fillHeight: false
Text {

8
Linphone/view/Page/Main/Contact/ContactPage.qml
View file

@ -218,11 +218,11 @@ AbstractMainPage {
Layout.fillHeight: true
Layout.fillWidth: true
FlexboxLayout {
RowLayout {
id: title
direction: FlexboxLayout.Row
gap: Utils.getSizeWithScreenRatio(16)
alignItems: FlexboxLayout.AlignCenter
// direction: FlexboxLayout.Row
spacing: Utils.getSizeWithScreenRatio(16)
// alignItems: FlexboxLayout.AlignCenter
anchors.top: leftPanel.top
anchors.right: leftPanel.right
anchors.left: leftPanel.left

16
Linphone/view/Page/Main/Meeting/MeetingPage.qml
View file

@ -148,10 +148,10 @@ AbstractMainPage {
ColumnLayout {
anchors.fill: parent
spacing: 0
FlexboxLayout {
direction: FlexboxLayout.Row
gap: Utils.getSizeWithScreenRatio(16)
alignItems: FlexboxLayout.AlignCenter
RowLayout {
// direction: FlexboxLayout.Row
// alignItems: FlexboxLayout.AlignCenter
spacing: Utils.getSizeWithScreenRatio(16)
Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
Layout.alignment: Qt.AlignTop
Layout.fillHeight: false
@ -621,7 +621,7 @@ AbstractMainPage {
FocusScope{
width: Utils.getSizeWithScreenRatio(393)
anchors.horizontalCenter: parent?.horizontalCenter
FlexboxLayout {
RowLayout {
id: meetingDetailsLayout
visible: mainItem.selectedConference
anchors.top: parent.top
@ -629,9 +629,9 @@ AbstractMainPage {
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottomMargin: Utils.getSizeWithScreenRatio(30)
width: Utils.getSizeWithScreenRatio(393)
direction: FlexboxLayout.Column
alignContent: FlexboxLayout.AlignSpaceBetween
gap: Utils.getSizeWithScreenRatio(16)
// direction: FlexboxLayout.Column
// alignContent: FlexboxLayout.AlignSpaceBetween
spacing: Utils.getSizeWithScreenRatio(16)
Section {
visible: mainItem.selectedConference
Layout.fillWidth: true