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

Updated Qt version to 6.10.2

Browse source
This commit is contained in:
Peio Rigaux 2026-02-25 15:44:27 +01:00
parent ba82083be2
commit 5aa3dc6350
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci-files/macosx-desktop.yml
View file

@ -26,7 +26,7 @@
.macosx-desktop: .macosx-desktop:
stage: build stage: build
tags: [ "macos-min-xcode12.2" ] tags: [ "macos-min-xcode15" ]
before_script: before_script:
- QT_MAC_VER=${QT_MAC_VER_FORCED:-$QT_MAC_VER} - QT_MAC_VER=${QT_MAC_VER_FORCED:-$QT_MAC_VER}
rules: rules:
@ -95,7 +95,7 @@ macosx-ninja-novideo:
# WAIT for QT6 for arm64 # WAIT for QT6 for arm64
macosx-ninja-package: macosx-ninja-package:
stage: package stage: package
tags: [ "macosx-min-xcode12.2" ] tags: [ "macos-min-xcode15" ]
needs: [] needs: []
rules: rules:
- !reference [.rules-merge-request-manual, rules] - !reference [.rules-merge-request-manual, rules]
@ -119,7 +119,7 @@ macosx-ninja-package:
macosx-codesigning: macosx-codesigning:
stage: signing stage: signing
tags: [ "macosx-min-xcode12.2" ] tags: [ "macos-min-xcode15" ]
needs: needs:
- macosx-ninja-package - macosx-ninja-package
rules: rules:
@ -144,7 +144,7 @@ macosx-codesigning:
macosx-deploy: macosx-deploy:
stage: deploy stage: deploy
tags: [ "macosx-min-xcode12.2" ] tags: [ "macos-min-xcode15" ]
needs: needs:
- macosx-codesigning - macosx-codesigning
only: only:
@ -162,7 +162,7 @@ macosx-deploy:
macosx-makefile-plugins-deploy: macosx-makefile-plugins-deploy:
stage: deploy stage: deploy
tags: [ "macosx-min-xcode12.2" ] tags: [ "macos-min-xcode15" ]
needs: needs:
- macosx-makefile - macosx-makefile
only: only:

2
.gitlab-ci.yml
View file

@ -25,7 +25,7 @@ variables:
#CMAKE_OPTIONS: -DENABLE_LIME_X3DH=YES #CMAKE_OPTIONS: -DENABLE_LIME_X3DH=YES
# Docker image version # Docker image version
UBUNTU_2204_IMAGE_VERSION: 20260209_add_qt_6.8.3_opensource UBUNTU_2204_IMAGE_VERSION: 20260225_add_qt_6.10.2
workflow: workflow:

13
docker-files/bc-dev-ubuntu-22-04-lts
View file

@ -93,6 +93,8 @@ RUN sudo python3 -m aqt install-qt linux desktop 6.9.1 -O /opt/Qt/opensource
RUN sudo python3 -m aqt install-qt linux desktop 6.9.1 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qt5compat qtshadertools RUN sudo python3 -m aqt install-qt linux desktop 6.9.1 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qt5compat qtshadertools
RUN sudo python3 -m aqt install-qt linux desktop 6.10.0 -O /opt/Qt/opensource RUN sudo python3 -m aqt install-qt linux desktop 6.10.0 -O /opt/Qt/opensource
RUN sudo python3 -m aqt install-qt linux desktop 6.10.0 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qt5compat qtshadertools RUN sudo python3 -m aqt install-qt linux desktop 6.10.0 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qt5compat qtshadertools
RUN sudo python3 -m aqt install-qt linux desktop 6.10.2 -O /opt/Qt/opensource
RUN sudo python3 -m aqt install-qt linux desktop 6.10.2 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qt5compat qtshadertools
RUN sudo chown -R bc:bc /opt/Qt/ RUN sudo chown -R bc:bc /opt/Qt/
@ -100,6 +102,7 @@ RUN qtchooser -install "5.15.2-opensource" /opt/Qt/opensource/5.15.2/gcc_64/bin/
RUN qtchooser -install "6.8.3-opensource" /opt/Qt/opensource/6.8.3/gcc_64/bin/qmake RUN qtchooser -install "6.8.3-opensource" /opt/Qt/opensource/6.8.3/gcc_64/bin/qmake
RUN qtchooser -install "6.9.1-opensource" /opt/Qt/opensource/6.9.1/gcc_64/bin/qmake RUN qtchooser -install "6.9.1-opensource" /opt/Qt/opensource/6.9.1/gcc_64/bin/qmake
RUN qtchooser -install "6.10.0-opensource" /opt/Qt/opensource/6.10.0/gcc_64/bin/qmake RUN qtchooser -install "6.10.0-opensource" /opt/Qt/opensource/6.10.0/gcc_64/bin/qmake
RUN qtchooser -install "6.10.2-opensource" /opt/Qt/opensource/6.10.2/gcc_64/bin/qmake
# Download QT official installer for proprietary versions # Download QT official installer for proprietary versions
# -O : name the destination file after the remote file name, in the current directory # -O : name the destination file after the remote file name, in the current directory
@ -170,12 +173,22 @@ RUN /opt/Qt/proprietary/MaintenanceTool \
--auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=Yes,stopProcessesForUpdates=Ignore,installationErrorWithCancel=Ignore,InstallationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No \ --auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=Yes,stopProcessesForUpdates=Ignore,installationErrorWithCancel=Ignore,InstallationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No \
install qt.qt6.6100.linux_gcc_64 qt.qt6.6100.addons.qtnetworkauth qt.qt6.6100.addons.qtquick3d qt.qt6.6100.addons.qt5compat qt.qt6.6100.addons.qtshadertools install qt.qt6.6100.linux_gcc_64 qt.qt6.6100.addons.qtnetworkauth qt.qt6.6100.addons.qtquick3d qt.qt6.6100.addons.qt5compat qt.qt6.6100.addons.qtshadertools
# # Install Qt 6.10.2 proprietary
RUN /opt/Qt/proprietary/MaintenanceTool \
--accept-licenses \
--accept-obligations \
--confirm-command \
--root "/opt/Qt/proprietary" \
--auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=Yes,stopProcessesForUpdates=Ignore,installationErrorWithCancel=Ignore,InstallationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No \
install qt.qt6.6102.linux_gcc_64 qt.qt6.6102.addons.qtnetworkauth qt.qt6.6102.addons.qtquick3d qt.qt6.6102.addons.qt5compat qt.qt6.6102.addons.qtshadertools
RUN qtchooser -install 5.15.19-proprietary /opt/Qt/proprietary/5.15.19/gcc_64/bin/qmake RUN qtchooser -install 5.15.19-proprietary /opt/Qt/proprietary/5.15.19/gcc_64/bin/qmake
RUN qtchooser -install 5.15.14-proprietary /opt/Qt/proprietary/5.15.14/gcc_64/bin/qmake RUN qtchooser -install 5.15.14-proprietary /opt/Qt/proprietary/5.15.14/gcc_64/bin/qmake
RUN qtchooser -install 6.8.1-proprietary /opt/Qt/proprietary/6.8.1/gcc_64/bin/qmake RUN qtchooser -install 6.8.1-proprietary /opt/Qt/proprietary/6.8.1/gcc_64/bin/qmake
RUN qtchooser -install 6.8.3-proprietary /opt/Qt/proprietary/6.8.3/gcc_64/bin/qmake RUN qtchooser -install 6.8.3-proprietary /opt/Qt/proprietary/6.8.3/gcc_64/bin/qmake
RUN qtchooser -install 6.9.1-proprietary /opt/Qt/proprietary/6.9.1/gcc_64/bin/qmake RUN qtchooser -install 6.9.1-proprietary /opt/Qt/proprietary/6.9.1/gcc_64/bin/qmake
RUN qtchooser -install 6.10.0-proprietary /opt/Qt/proprietary/6.10.0/gcc_64/bin/qmake RUN qtchooser -install 6.10.0-proprietary /opt/Qt/proprietary/6.10.0/gcc_64/bin/qmake
RUN qtchooser -install 6.10.2-proprietary /opt/Qt/proprietary/6.10.2/gcc_64/bin/qmake
RUN rm -f /home/bc/.local/share/Qt/qtaccount.ini RUN rm -f /home/bc/.local/share/Qt/qtaccount.ini
RUN rm -f /home/bc/.local/share/Qt/qtlicenses.ini RUN rm -f /home/bc/.local/share/Qt/qtlicenses.ini