diff --git a/Linphone/CMakeLists.txt b/Linphone/CMakeLists.txt index 673a0b7ed..bdb8fdf7a 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 93cb51182..dfbff4b53 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -517,14 +517,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/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 32d320090..e99255e09 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