Skip to content

scripts: upgrade qt to 6.9.0 for all platforms #18011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scripts: upgrade qt to 6.9.0 for all platforms #18011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions scripts/macos_build_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ set -eo pipefail

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

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

curl -o /tmp/qt@5.rb "${QT_FORMULA_URL}"
brew install /tmp/qt@5.rb
rm /tmp/qt@5.rb
curl -o /tmp/qt.rb "${QT_FORMULA_URL}"
brew install /tmp/qt.rb
rm /tmp/[email protected]
}

function install_cmake {
Expand Down
4 changes: 2 additions & 2 deletions scripts/ubuntu_build_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -eo pipefail

GO_VERSION="1.22.10"
GO_INSTALL_DIR="/usr/local/go"
QT_VERSION="5.15.2"
QT_VERSION="6.9.0"
QT_INSTALL_DIR="/opt/qt"

function check_version {
Expand Down Expand Up @@ -47,7 +47,7 @@ function install_qt {
apt install -y python3-pip
pip install -U pip
pip install aqtinstall
aqt install-qt linux desktop ${QT_VERSION} gcc_64 -m qtwebengine -O ${QT_INSTALL_DIR}
aqt install-qt linux desktop ${QT_VERSION} linux_gcc_64 -m all -O ${QT_INSTALL_DIR}
}

function get_go_arch {
Expand Down
14 changes: 7 additions & 7 deletions scripts/windows_build_setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ function Install-Dependencies {
function Install-Qt-SDK {
Write-Host "Installing Qt $QtVersion SDK..."
pip install aqtinstall
aqt install-qt -O "C:\Qt" windows desktop $QtVersion win64_msvc2019_64 -m qtwebengine qtlottie
aqt install-qt -O "C:\Qt" windows desktop $QtVersion win64_msvc2022_64 -m all
}

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

Write-Host "Downloading Microsoft Visual C++ Build Tools..."
Expand Down Expand Up @@ -81,15 +81,15 @@ SUCCESS!

Before you attempt to build nim-status-client you'll need a few environment variables set:

export QTDIR="/c/Qt/$QtVersion/msvc2019_64"
export Qt5_DIR="/c/Qt/$QtVersion/msvc2019_64"
export QTDIR="/c/Qt/$QtVersion/msvc2022_64"
export Qt5_DIR="/c/Qt/$QtVersion/msvc2022_64"
export VCINSTALLDIR="/c/BuildTools/VC"

You might also have to include the following paths in your `$PATH:

export PATH=`"$env:USERPROFILE/go/bin:`$PATH`"
export PATH=`"/c/BuildTools/MSBuild/Current/Bin:`$PATH`"
export PATH=`"/c/BuildTools/VC/Tools/MSVC/14.29.30133/bin:`$PATH`"
export PATH=`"/c/BuildTools/VC/Tools/MSVC/14.44.35207/bin:`$PATH`"
export PATH=`"/c/ProgramData/scoop/apps/inno-setup/current:`$PATH`"
"@
}
Expand All @@ -99,7 +99,7 @@ export PATH=`"/c/ProgramData/scoop/apps/inno-setup/current:`$PATH`"
# Stop the script after first error
$ErrorActionPreference = 'Stop'
# Version of Qt SDK available form aqt
$QtVersion = "5.15.2"
$QtVersion = "6.9.0"

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