Skip to content

Commit

Permalink
Fix #934: Switch to Qt 6.7.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.7.1

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

#codehealth

PiperOrigin-RevId: 636046552
  • Loading branch information
yukawa authored and hiroyuki-komatsu committed May 22, 2024
1 parent caeb9ce commit 716ad78
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 6 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 @@ -87,7 +87,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.7.0](https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz)
* [Qt 6.7.1](https://download.qt.io/archive/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.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 @@ -65,7 +65,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.7.0](https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz)
* [Qt 6.7.1](https://download.qt.io/archive/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz)
* [.NET tools](../dotnet-tools.json)
* [git submodules](../.gitmodules)

Expand Down
29 changes: 29 additions & 0 deletions src/WORKSPACE.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
# Copyright 2010-2021, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# An identifier for this repository.
workspace(name = "mozc")

Expand Down
2 changes: 1 addition & 1 deletion src/build_tools/build_qt.py
Original file line number Diff line number Diff line change
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.7.0.tar.xz')
'third_party_cache', 'qtbase-everywhere-src-6.7.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.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz',
size=49314276,
sha256='11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254',
url='https://download.qt.io/archive/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz',
size=49324536,
sha256='b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19',
)

NINJA_MAC = ArchiveInfo(
Expand Down

0 comments on commit 716ad78

Please sign in to comment.