Skip to content

Commit

Permalink
Bump Qt version to 5.12.12 to try to fix problems on Mac
Browse files Browse the repository at this point in the history
out of line definition of setColorSpace does not match any definition in QIOSurfaceBuffer
  • Loading branch information
martinburchell committed Mar 28, 2023
1 parent 51f4d0f commit 7702871
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions tablet_qt/tools/build_qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
QT_GIT_URL = "git://code.qt.io/qt/qt5.git"
QT_GIT_BRANCH = "5.12" # is 5.12.4 as of 2019-06-18 (released 2019-06-17)
QT_GIT_COMMIT = HEAD
QT_SPECIFIC_VERSION = "5.12.11"
QT_SPECIFIC_VERSION = "5.12.12"

if QT_SPECIFIC_VERSION:
QT_VERSION = Version(QT_SPECIFIC_VERSION)
Expand Down Expand Up @@ -3265,7 +3265,6 @@ def fetch_qt(cfg: Config) -> None:
prettyname="Qt",
url=cfg.qt_git_url,
branch=cfg.qt_git_branch,
commit=cfg.qt_git_commit,
directory=cfg.qt_src_gitdir,
run_func=run,
):
Expand All @@ -3274,7 +3273,7 @@ def fetch_qt(cfg: Config) -> None:
run([PERL, "init-repository"])
# Now, as per https://wiki.qt.io/Android:
if QT_SPECIFIC_VERSION:
run([GIT, "checkout", f"v{QT_SPECIFIC_VERSION}"])
run([GIT, "checkout", cfg.qt_git_commit])
run([GIT, "submodule", "update", "--recursive"])


Expand Down

0 comments on commit 7702871

Please sign in to comment.