Skip to content

Commit 0f9b28e

Browse files
committed
scripts: upgrade qt to 6.9.0 for all platforms
Referenced issue: * #17639
1 parent f725835 commit 0f9b28e

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

scripts/macos_build_setup.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ set -eo pipefail
33

44
GO_VERSION="1.22.10"
55
GO_INSTALL_DIR="/usr/local/go"
6-
QT_VERSION="5.15.16_1"
7-
# https://github.com/Homebrew/homebrew-core/commit/2c1970eb750f254ecac6640e7e816fd77a5e065e
8-
QT_BREW_FORMULA_COMMIT_SHA="2c1970eb750f254ecac6640e7e816fd77a5e065e"
9-
QT_FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/${QT_BREW_FORMULA_COMMIT_SHA}/Formula/q/qt%405.rb"
6+
QT_VERSION="6.9.0"
7+
# https://github.com/Homebrew/homebrew-core/commit/7cd0acddf7097fbbedbcee05211863d263e35b63
8+
QT_BREW_FORMULA_COMMIT_SHA="7cd0acddf7097fbbedbcee05211863d263e35b63"
9+
QT_FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/${QT_BREW_FORMULA_COMMIT_SHA}/Formula/q/qt.rb"
1010
# https://github.com/Homebrew/homebrew-core/commit/b4e46db74e74a8c1650b38b1da222284ce1ec5ce
1111
CMAKE_VERSION="3.31.6"
1212
CMAKE_BREW_FORMULA_COMMIT_SHA="b4e46db74e74a8c1650b38b1da222284ce1ec5ce"
1313
CMAKE_FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/${CMAKE_BREW_FORMULA_COMMIT_SHA}/Formula/c/cmake.rb"
1414
BREW_PREFIX=$(brew --prefix)
15-
QT_INSTALL_DIR="${BREW_PREFIX}/Cellar/qt@5/${QT_VERSION}"
15+
QT_INSTALL_DIR="${BREW_PREFIX}/Cellar/qt@6/${QT_VERSION}"
1616
CMAKE_INSTALL_DIR="${BREW_PREFIX}/Cellar/cmake/${CMAKE_VERSION}"
1717

1818
function check_version {
@@ -33,9 +33,9 @@ function install_qt {
3333
echo "Detected Homebrew prefix: ${BREW_PREFIX}"
3434
echo "Qt will be installed to: ${QT_INSTALL_DIR}"
3535

36-
curl -o /tmp/qt@5.rb "${QT_FORMULA_URL}"
37-
brew install /tmp/qt@5.rb
38-
rm /tmp/qt@5.rb
36+
curl -o /tmp/qt.rb "${QT_FORMULA_URL}"
37+
brew install /tmp/qt.rb
38+
3939
}
4040

4141
function install_cmake {

scripts/ubuntu_build_setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -eo pipefail
33

44
GO_VERSION="1.22.10"
55
GO_INSTALL_DIR="/usr/local/go"
6-
QT_VERSION="5.15.2"
6+
QT_VERSION="6.9.0"
77
QT_INSTALL_DIR="/opt/qt"
88

99
function check_version {
@@ -47,7 +47,7 @@ function install_qt {
4747
apt install -y python3-pip
4848
pip install -U pip
4949
pip install aqtinstall
50-
aqt install-qt linux desktop ${QT_VERSION} gcc_64 -m qtwebengine -O ${QT_INSTALL_DIR}
50+
aqt install-qt linux desktop ${QT_VERSION} linux_gcc_64 -m all -O ${QT_INSTALL_DIR}
5151
}
5252

5353
function get_go_arch {

scripts/windows_build_setup.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ function Install-Dependencies {
4646
function Install-Qt-SDK {
4747
Write-Host "Installing Qt $QtVersion SDK..."
4848
pip install aqtinstall
49-
aqt install-qt -O "C:\Qt" windows desktop $QtVersion win64_msvc2019_64 -m qtwebengine qtlottie
49+
aqt install-qt -O "C:\Qt" windows desktop $QtVersion win64_msvc2022_64 -m all
5050
}
5151

52-
# Install Microsoft Visual C++ Build Tools 16.11.23
52+
# Install Microsoft Visual C++ Build Tools 17.13.35
5353
function Install-VC-BuildTools {
54-
$VCBuildToolsUrl = "https://download.visualstudio.microsoft.com/download/pr/33d686db-3937-4a19-bb3c-be031c5d69bf/66d85abf1020496b07c59aba176def5127352f2fbdd3c4c4143738ab7dfcb459/vs_BuildTools.exe"
54+
$VCBuildToolsUrl = "https://aka.ms/vs/17/release/vs_BuildTools.exe"
5555
$VCBuildToolsExe = "$HOME\Downloads\vs_BuildTools.exe"
5656

5757
Write-Host "Downloading Microsoft Visual C++ Build Tools..."
@@ -81,15 +81,15 @@ SUCCESS!
8181
8282
Before you attempt to build nim-status-client you'll need a few environment variables set:
8383
84-
export QTDIR="/c/Qt/$QtVersion/msvc2019_64"
85-
export Qt5_DIR="/c/Qt/$QtVersion/msvc2019_64"
84+
export QTDIR="/c/Qt/$QtVersion/msvc2022_64"
85+
export Qt5_DIR="/c/Qt/$QtVersion/msvc2022_64"
8686
export VCINSTALLDIR="/c/BuildTools/VC"
8787
8888
You might also have to include the following paths in your `$PATH:
8989
9090
export PATH=`"$env:USERPROFILE/go/bin:`$PATH`"
9191
export PATH=`"/c/BuildTools/MSBuild/Current/Bin:`$PATH`"
92-
export PATH=`"/c/BuildTools/VC/Tools/MSVC/14.29.30133/bin:`$PATH`"
92+
export PATH=`"/c/BuildTools/VC/Tools/MSVC/14.44.35207/bin:`$PATH`"
9393
export PATH=`"/c/ProgramData/scoop/apps/inno-setup/current:`$PATH`"
9494
"@
9595
}
@@ -99,7 +99,7 @@ export PATH=`"/c/ProgramData/scoop/apps/inno-setup/current:`$PATH`"
9999
# Stop the script after first error
100100
$ErrorActionPreference = 'Stop'
101101
# Version of Qt SDK available form aqt
102-
$QtVersion = "5.15.2"
102+
$QtVersion = "6.9.0"
103103

104104
# Don't run when sourcing script
105105
If ($MyInvocation.InvocationName -ne ".") {

0 commit comments

Comments
 (0)