Revert to Qt 6.3.1 on macOS

Due to flicker reported on #2263. 6.3.1 was used in the 2.1.54 and is
the more conservative choice; we can trial 6.3.2 after release.

build/configure/src/bundle.rs

@@ -171,7 +171,11 @@ const QT5_VENV: Venv = Venv {
 fn setup_primary_venv(build: &mut Build, python_binary: &BuildInput) -> Result<()> {
     let mut qt6_reqs = inputs![
         "python/requirements.bundle.txt",
-        "python/requirements.qt6.txt",
+        if cfg!(target_os = "macos") {
+            "python/requirements.qt6_3.txt"
+        } else {
+            "python/requirements.qt6_4.txt"
+        }
     ];
     if cfg!(windows) {
         qt6_reqs = inputs![qt6_reqs, "python/requirements.win.txt"];

build/configure/src/python.rs

@@ -82,13 +82,20 @@ pub fn setup_venv(build: &mut Build, python_binary: &BuildInput) -> Result<()> {
     let requirements_txt = if cfg!(windows) {
         inputs![
             "python/requirements.dev.txt",
-            "python/requirements.qt6.txt",
+            "python/requirements.qt6_4.txt",
             "python/requirements.win.txt",
         ]
     } else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
         inputs!["python/requirements.dev.txt"]
     } else {
-        inputs!["python/requirements.dev.txt", "python/requirements.qt6.txt",]
+        inputs![
+            "python/requirements.dev.txt",
+            if cfg!(target_os = "macos") {
+                "python/requirements.qt6_3.txt"
+            } else {
+                "python/requirements.qt6_4.txt"
+            }
+        ]
     };
     build.add(
         "pyenv",

python/requirements.qt6_3.in

@@ -0,0 +1,5 @@
+pyqt6==6.3.1
+pyqt6-qt6==6.3.1
+pyqt6-webengine==6.3.1
+pyqt6-webengine-qt6==6.3.1
+pyqt6_sip==13.4.0

python/requirements.qt6_3.txt

@@ -0,0 +1,51 @@
+pyqt6==6.3.1 \
+    --hash=sha256:115f809810c236af90352b4df4a9dfc79cbd05b7c0200c05886c8b3035c2847b \
+    --hash=sha256:8cc6e21dbaf7047d1fc897e396ccd9710a12f2ef976563dad65f06017d2c9757 \
+    --hash=sha256:c87c909eeafc44ea911a94490d55055058f51a27ec5ca0e439a9feb943a73fd1 \
+    --hash=sha256:f7ad13b44959b72c8d40fa1856470015fab3368983dd2c1c781d4061c45d96b3
+    # via
+    #   -r requirements.qt6_3.in
+    #   pyqt6-webengine
+pyqt6-qt6==6.3.1 \
+    --hash=sha256:07d4d825515c8d05ffc9fed002e4d9c861467cfff6f8c57ff1a89fe18f73b06d \
+    --hash=sha256:33d010c9ac85b7482b3f425fb1d00c1f5bf4422ff057dc848632c26eec96a2ca \
+    --hash=sha256:5db960e00cceb93762e6755026dbbe2e781d7e3bdcbc79e107db4d5557041421 \
+    --hash=sha256:731e472addf9e0aca32e27577ac3d6a98e3e8e8723d352714366c47abe9294af
+    # via
+    #   -r requirements.qt6_3.in
+    #   pyqt6
+pyqt6-sip==13.4.0 \
+    --hash=sha256:2694ae67811cefb6ea3ee0e9995755b45e4952f4dcadec8c04300fd828f91c75 \
+    --hash=sha256:3486914137f5336cff6e10a5e9d52c1e60ff883473938b45f267f794daeacb2f \
+    --hash=sha256:3ac7e0800180202dcc0c7035ff88c2a6f4a0f5acb20c4a19f71d807d0f7857b7 \
+    --hash=sha256:3de18c4a32f717a351d560a39f528af24077f5135aacfa8890a2f2d79f0633da \
+    --hash=sha256:6d87a3ee5872d7511b76957d68a32109352caf3b7a42a01d9ee20032b350d979 \
+    --hash=sha256:77af9c7e3f50414ec5af9b1534aaf2ba25115ae65aa5ed735111c8ef0884b862 \
+    --hash=sha256:802b0cfed19900183220c46895c2635f0dd062f2d275a25506423f911ef74db4 \
+    --hash=sha256:83b446d247a92d119d507dbc94fc1f47389d8118a5b6232a2859951157319a30 \
+    --hash=sha256:9c5231536e6153071b22175e46e368045fd08d772a90d772a0977d1166c7822c \
+    --hash=sha256:9e03c780846fd5d71c06e33322fd11a05713d9cd410e3571d069ac9a84077647 \
+    --hash=sha256:bb4f2e2fdcf3a8dafe4256750bbedd9e7107c4fd8afa9c25be28423c36bb12b8 \
+    --hash=sha256:cfdcd43e123bd55c155cfe7a33895033e6d25de90a48ed9c25a0ddd0196a810e \
+    --hash=sha256:d51704d50b82713fd7c928b7deb31e17be239ddac74fc2fd708e52bd21ecea3a \
+    --hash=sha256:de601187055d684b36ebe6e800a5deacaa55b69d71ad43312b76422cfeae0e12 \
+    --hash=sha256:e3b17308ca729bcb6d25c01144c6b2e17d40812231c3ef9caaa72a78db2b1069 \
+    --hash=sha256:fd2df2a9479b8ac858117bd55dc0ec0bd1ce6c8f3486b0cc5e860c0540a8bba0
+    # via
+    #   -r requirements.qt6_3.in
+    #   pyqt6
+    #   pyqt6-webengine
+pyqt6-webengine==6.3.1 \
+    --hash=sha256:096651b305f1b8baa9a91895a64d41f7cd8628e7b2f33d5a30cddabd6f8e9c7b \
+    --hash=sha256:24d159dc0f0e006b153bb4c853157ea03a84e12066ddec4b48142cf9f85c764b \
+    --hash=sha256:9ceaf7925c01700a5f7d8b3f22824add8d69a01445ba463198e79242b227af20 \
+    --hash=sha256:c3d1f5527b4b15f44102d617c59b1d74d9af50f821629e9335f13df47de8f007
+    # via -r requirements.qt6_3.in
+pyqt6-webengine-qt6==6.3.1 \
+    --hash=sha256:30dfe708f9356ea9085f9b71b72852883e2da58ef4039b0551a798f1c6723f1e \
+    --hash=sha256:657b3f81105e603332f77fe4319bf5a371e413de7b581be343301932c98a06af \
+    --hash=sha256:6eeb50030b14385341f9fc40b5f05c8edf281fd4533305cd2b000f8e587e7ec6 \
+    --hash=sha256:d8360631d10301684589db45ca5ea8503e1321e7f2d19cdf45dae716d31cda83
+    # via
+    #   -r requirements.qt6_3.in
+    #   pyqt6-webengine

python/requirements.qt6_4.txt

@@ -4,7 +4,7 @@ pyqt6==6.4.0 \
     --hash=sha256:8e614cc4b95dec8bec8ba3c3eaf821058b45862e66d69a8c4fb5576123f2be98 \
     --hash=sha256:91392469be1f491905fa9e78fa4e4059a89ab616ddf2ecfd525bc1d65c26bb93
     # via
-    #   -r requirements.qt6.in
+    #   -r requirements.qt6_4.in
     #   pyqt6-webengine
 pyqt6-qt6==6.4.0 \
     --hash=sha256:38cfedf942f6982e2492234c4912a6f9ae0d54430313ba32297b7d673adaa11d \
@@ -12,7 +12,7 @@ pyqt6-qt6==6.4.0 \
     --hash=sha256:adee1f98678adebf14cdf4ea1f95cf00b6a644c14e9a79136166d0060de72dfc \
     --hash=sha256:fe846c6f89c4ca720ec03c85ec31ac6cc3ffbe8bf5e780f25f99a4cac3372f7c
     # via
-    #   -r requirements.qt6.in
+    #   -r requirements.qt6_4.in
     #   pyqt6
 pyqt6-sip==13.4.0 \
     --hash=sha256:2694ae67811cefb6ea3ee0e9995755b45e4952f4dcadec8c04300fd828f91c75 \
@@ -32,7 +32,7 @@ pyqt6-sip==13.4.0 \
     --hash=sha256:e3b17308ca729bcb6d25c01144c6b2e17d40812231c3ef9caaa72a78db2b1069 \
     --hash=sha256:fd2df2a9479b8ac858117bd55dc0ec0bd1ce6c8f3486b0cc5e860c0540a8bba0
     # via
-    #   -r requirements.qt6.in
+    #   -r requirements.qt6_4.in
     #   pyqt6
     #   pyqt6-webengine
 pyqt6-webengine==6.4.0 \
@@ -40,12 +40,12 @@ pyqt6-webengine==6.4.0 \
     --hash=sha256:4c71c130860abcd11e04cafb22e33983fa9a3aee8323c51909b15a1701828e21 \
     --hash=sha256:7f6cde52b7b8c00ef2a1522ad92cde66f2bd3a3066646efe4ef96a4907b1b1cd \
     --hash=sha256:9658919bc1c5279a6fae9e6990448dfe483e136e957e6fb14e8f6265f4e9d1da
-    # via -r requirements.qt6.in
+    # via -r requirements.qt6_4.in
 pyqt6-webengine-qt6==6.4.0 \
     --hash=sha256:572e7fee6de616191b98dd974ced8bd732e86dc1856c1ada7ad734402e37285c \
     --hash=sha256:689127e483ab76744477762ab936de9541e7fc368ab4f4ee463a9099bf8bc5be \
     --hash=sha256:971aedd051c77c17c59e724692636a4a0883c70dff3dbd172ae7cfb2fe7ddcc4 \
     --hash=sha256:f13b3582c7f170017ecd52ec4c2e735c859316f05820e1bb4a2910c530611af4
     # via
-    #   -r requirements.qt6.in
+    #   -r requirements.qt6_4.in
     #   pyqt6-webengine

python/update_python_deps.sh

@@ -17,7 +17,8 @@ args="--resolver=backtracking --allow-unsafe --no-header --strip-extras --genera
 
 # during bundle
 ../out/pyenv/bin/pip-compile $args $upgrade requirements.bundle.in 
-../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6.in
+../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_3.in
+../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_4.in
 # ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_14.in
 # ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_15.in