diff --git a/Linphone/CMakeLists.txt b/Linphone/CMakeLists.txt index 776fd415a..3c6ede269 100644 --- a/Linphone/CMakeLists.txt +++ b/Linphone/CMakeLists.txt @@ -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() diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index 11747b200..3ce9c3801 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -515,14 +515,16 @@ void App::setSelf(QSharedPointer(me)) { case linphone::VersionUpdateCheckResult::NewVersionAvailable: { QString downloadLink = QStringLiteral("%2") - .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: diff --git a/Linphone/core/proxy/SortFilterProxy.cpp b/Linphone/core/proxy/SortFilterProxy.cpp index 5e34337a4..48e2eac4a 100644 --- a/Linphone/core/proxy/SortFilterProxy.cpp +++ b/Linphone/core/proxy/SortFilterProxy.cpp @@ -109,6 +109,6 @@ void SortFilterProxy::invalidateFilter() { QSortFilterProxyModel::beginFilterChange(); QSortFilterProxyModel::endFilterChange(); #else - invalidateFilter(); + QSortFilterProxyModel::invalidateFilter(); #endif } diff --git a/Linphone/data/languages/de.ts b/Linphone/data/languages/de.ts index 563cff1b9..fe2380425 100644 --- a/Linphone/data/languages/de.ts +++ b/Linphone/data/languages/de.ts @@ -31,7 +31,7 @@ Telefonnummer oder SIP-Adresse wählen - + fps_counter %1 FPS @@ -682,14 +682,14 @@ - + info_popup_error_title Error Fehler - + info_popup_configuration_failed_message Remote provisioning failed : %1 Remote-Provisionierung fehlgeschlagen: %1 @@ -718,97 +718,97 @@ Eine neue Version von Linphone (%1) ist unter %1 verfügbar - + info_popup_version_up_to_date_title Auf dem neuesten Stand - + info_popup_version_up_to_date_message Your version is up to date Ihre Version ist auf dem neuesten Stand - + configuration_error_detail not reachable nicht erreichbar - + application_description "A free and open source SIP video-phone." Ein kostenloses Open-Source SIP Video-Telefon. - + command_line_arg_order "Send an order to the application towards a command line" Kommandozeilen-Befehl an die Anwendung schicken - + command_line_option_show_help Zeige Hilfe - + command_line_option_show_app_version App-Version anzeigen - + command_line_option_config_to_fetch "Specify the linphone configuration file to be fetched. It will be merged with the current configuration." Abzurufende Linphone-Konfigurationsdatei angeben. Sie wird mit der aktuellen Konfiguration zusammengeführt. - + command_line_option_config_to_fetch_arg "URL, path or file" URL, Pfad oder Datei - + command_line_option_minimized Minimieren - + command_line_option_log_to_stdout Debug-Informationen auf der Standardausgabe ausgeben - + command_line_option_print_app_logs_only "Print only logs from the application" Nur Anwendungs-Logs ausgeben - + hide_action "Cacher" "Afficher" Ausblenden - + show_action Zeigen - + quit_action "Quitter" Beenden - + check_for_update Check for update Auf Updates prüfen - + mark_all_read_action Alle als gelesen markieren diff --git a/Linphone/data/languages/en.ts b/Linphone/data/languages/en.ts index 9bd1b7935..c2d2e7fd2 100644 --- a/Linphone/data/languages/en.ts +++ b/Linphone/data/languages/en.ts @@ -31,7 +31,7 @@ Choose a SIP number or address - + fps_counter %1 FPS @@ -663,14 +663,14 @@ - + info_popup_error_title Error Error - + info_popup_configuration_failed_message Remote provisioning failed : %1 Remote provisioning failed : %1 @@ -699,97 +699,97 @@ A new version of Linphone (%1) is available at %1 - + info_popup_version_up_to_date_title Up to date - + info_popup_version_up_to_date_message Your version is up to date Up to date Your version is up to date - + configuration_error_detail not reachable not reachable - + application_description "A free and open source SIP video-phone." A free and open source SIP video-phone. - + command_line_arg_order "Send an order to the application towards a command line" Send an order to the application towards a command line - + command_line_option_show_help Show this help - + command_line_option_show_app_version Show app version - + command_line_option_config_to_fetch "Specify the linphone configuration file to be fetched. It will be merged with the current configuration." Specify the linphone configuration file to be fetched. It will be merged with the current configuration. - + command_line_option_config_to_fetch_arg "URL, path or file" URL, path or file - + command_line_option_minimized Minimize - + command_line_option_log_to_stdout Log to stdout some debug information while running - + command_line_option_print_app_logs_only "Print only logs from the application" Print only logs from the application - + hide_action "Cacher" "Afficher" Hide - + show_action Show - + quit_action "Quitter" Quit - + check_for_update Check for update Check for update - + mark_all_read_action Marquer tout comme lu diff --git a/Linphone/data/languages/fr.ts b/Linphone/data/languages/fr.ts index 8339f3d09..2ec8dcce3 100644 --- a/Linphone/data/languages/fr.ts +++ b/Linphone/data/languages/fr.ts @@ -31,7 +31,7 @@ Choisissez un numéro ou adresse SIP - + fps_counter %1 FPS @@ -658,14 +658,14 @@ - + info_popup_error_title Error Erreur - + info_popup_configuration_failed_message Remote provisioning failed : %1 La configuration distante a échoué : %1 @@ -694,97 +694,97 @@ Une nouvelle version de Linphone (%1) est disponible. %2 - + info_popup_version_up_to_date_title À jour - + info_popup_version_up_to_date_message Your version is up to date Votre version est à jour - + configuration_error_detail not reachable indisponible - + application_description "A free and open source SIP video-phone." A free and open source SIP video-phone. - + command_line_arg_order "Send an order to the application towards a command line" Send an order to the application towards a command line - + command_line_option_show_help Show this help - + command_line_option_show_app_version Afficher la version de l'application - + command_line_option_config_to_fetch "Specify the linphone configuration file to be fetched. It will be merged with the current configuration." Specify the linphone configuration file to be fetched. It will be merged with the current configuration. - + command_line_option_config_to_fetch_arg "URL, path or file" URL, path or file - + command_line_option_minimized Minimiser - + command_line_option_log_to_stdout Log to stdout some debug information while running - + command_line_option_print_app_logs_only "Print only logs from the application" Print only logs from the application - + hide_action "Cacher" "Afficher" Cacher - + show_action Afficher - + quit_action "Quitter" Quitter - + check_for_update Check for update Rechercher une mise à jour - + mark_all_read_action Marquer tout comme lu diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml index 8ecdf393c..b9302f14d 100644 --- a/Linphone/view/Page/Main/Call/CallPage.qml +++ b/Linphone/view/Page/Main/Call/CallPage.qml @@ -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 { diff --git a/Linphone/view/Page/Main/Chat/ChatPage.qml b/Linphone/view/Page/Main/Chat/ChatPage.qml index 17b8f3f50..e15c15f3f 100644 --- a/Linphone/view/Page/Main/Chat/ChatPage.qml +++ b/Linphone/view/Page/Main/Chat/ChatPage.qml @@ -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 { diff --git a/Linphone/view/Page/Main/Contact/ContactPage.qml b/Linphone/view/Page/Main/Contact/ContactPage.qml index 778f9519e..6cd972056 100644 --- a/Linphone/view/Page/Main/Contact/ContactPage.qml +++ b/Linphone/view/Page/Main/Contact/ContactPage.qml @@ -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 diff --git a/Linphone/view/Page/Main/Meeting/MeetingPage.qml b/Linphone/view/Page/Main/Meeting/MeetingPage.qml index b435d5a1c..3c8336993 100644 --- a/Linphone/view/Page/Main/Meeting/MeetingPage.qml +++ b/Linphone/view/Page/Main/Meeting/MeetingPage.qml @@ -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