Skip to content

Commit

Permalink
Fix google#833: Switch to Qt 6.6.0 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.0 [1], which
contains an important commit for Per-Monitor DPI support in Windows [2]
as discussed in google#831.

Note that '-no-feature-systemsemaphore' needs to be removed as otherwise
the build fails in macOS.

 [1]: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
 [2]: qt/qtbase@5e0d9a0

PiperOrigin-RevId: 575700086
  • Loading branch information
yukawa authored and coooooooozy committed Nov 25, 2023
1 parent 8da710a commit b3ed7ab
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 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.5.2](https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz)
* [Qt 6.6.0](https://download.qt.io/archive/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.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.5.2](https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz)
* [Qt 6.6.0](https://download.qt.io/archive/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz)
* [WiX 3.14.0.6526](https://wixtoolset.org/downloads/v3.14.0.6526/wix314-binaries.zip)
* [git submodules](../.gitmodules)

Expand Down
5 changes: 2 additions & 3 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.5.3.tar.xz
src/third_party_cache/qtbase-everywhere-src-6.6.0.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.5.3.tar.xz')
'third_party_cache', 'qtbase-everywhere-src-6.6.0.tar.xz')
ABS_DEFAULT_NINJA_DIR = ABS_MOZC_SRC_DIR.joinpath('third_party', 'ninja')


Expand Down Expand Up @@ -296,7 +296,6 @@ def make_configure_options(args: argparse.Namespace) -> list[str]:
'-no-feature-sqlmodel',
'-no-feature-sspi',
'-no-feature-stringlistmodel',
'-no-feature-systemsemaphore',
'-no-feature-tabletevent',
'-no-feature-testlib',
'-no-feature-textbrowser',
Expand Down

0 comments on commit b3ed7ab

Please sign in to comment.