Skip to content

Commit

Permalink
Fix #846: Switch to Qt 6.6.1 for macOS and Windows
Browse files Browse the repository at this point in the history
With this commit macOS and Windows builds switch to Qt 6.6.1.

Here is the release note:
https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md

PiperOrigin-RevId: 586486141
  • Loading branch information
yukawa authored and hiroyuki-komatsu committed Nov 30, 2023
1 parent 2eb2901 commit 26fb448
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/build_mozc_in_osx.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ python build_tools/update_deps.py
In this step, additional build dependencies will be downloaded.

* [Ninja 1.11.0](https://github.com/ninja-build/ninja/releases/download/v1.11.0/ninja-mac.zip)
* [Qt 6.6.0](https://download.qt.io/archive/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz)
* [Qt 6.6.1](https://download.qt.io/archive/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz)
* [git submodules](../.gitmodules)

You can specify `--noqt` option if you would like to use your own Qt binaries.
Expand Down
2 changes: 1 addition & 1 deletion docs/build_mozc_in_windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ python build_tools/update_deps.py
In this step, additional build dependencies will be downloaded.

* [Ninja 1.11.0](https://github.com/ninja-build/ninja/releases/download/v1.11.0/ninja-win.zip)
* [Qt 6.6.0](https://download.qt.io/archive/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz)
* [Qt 6.6.1](https://download.qt.io/archive/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz)
* [WiX 3.14.0.6526](https://wixtoolset.org/downloads/v3.14.0.6526/wix314-binaries.zip)
* [git submodules](../.gitmodules)

Expand Down
4 changes: 2 additions & 2 deletions src/build_tools/build_qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
By default, this script assumes that Qt archives are stored as
src/third_party_cache/qtbase-everywhere-src-6.6.0.tar.xz
src/third_party_cache/qtbase-everywhere-src-6.6.1.tar.xz
and Qt src files that are necessary to build Mozc will be checked out into
Expand Down Expand Up @@ -69,7 +69,7 @@
ABS_QT_DEST_DIR = ABS_MOZC_SRC_DIR.joinpath('third_party', 'qt')
# The archive filename should be consistent with update_deps.py.
ABS_QT6_ARCHIVE_PATH = ABS_MOZC_SRC_DIR.joinpath(
'third_party_cache', 'qtbase-everywhere-src-6.6.0.tar.xz')
'third_party_cache', 'qtbase-everywhere-src-6.6.1.tar.xz')
ABS_DEFAULT_NINJA_DIR = ABS_MOZC_SRC_DIR.joinpath('third_party', 'ninja')


Expand Down
6 changes: 3 additions & 3 deletions src/build_tools/update_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ def __hash__(self):


QT6 = ArchiveInfo(
url='https://download.qt.io/archive/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz',
size=48350308,
sha256='039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e',
url='https://download.qt.io/archive/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz',
size=48370760,
sha256='450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7',
)

WIX = ArchiveInfo(
Expand Down

0 comments on commit 26fb448

Please sign in to comment.