mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-17 11:58:27 +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.9 as minimum version
This commit is contained in:
Gaelle Braud 2026-02-09 12:15:34 +01:00 • committed by gaelle
parent ce439ac7bf
commit 3f53759f86
7 changed files with 27 additions and 25 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

@ -517,14 +517,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
}

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