From 02f0994903f05429a54b7e24953a2710516433d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Thu, 25 Apr 2024 14:57:19 +0200
Subject: [PATCH 1/3] :bug: fix support of PySide6 in Unreal 5.4

---
 client/ayon_core/hosts/unreal/ue_workers.py | 32 +++++++++++++++------
 pyproject.toml                              |  2 +-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/client/ayon_core/hosts/unreal/ue_workers.py b/client/ayon_core/hosts/unreal/ue_workers.py
index e3f8729c2e..a987abcc83 100644
--- a/client/ayon_core/hosts/unreal/ue_workers.py
+++ b/client/ayon_core/hosts/unreal/ue_workers.py
@@ -260,11 +260,11 @@ class UEProjectGenerationWorker(UEWorker):
                 self.failed.emit(msg, return_code)
                 raise RuntimeError(msg)
 
-        # ensure we have PySide2 installed in engine
+        # ensure we have PySide2/6 installed in engine
 
         self.progress.emit(0)
         self.stage_begin.emit(
-            (f"Checking PySide2 installation... {stage_count} "
+            (f"Checking Qt bindings installation... {stage_count} "
              f" out of {stage_count}"))
         python_path = None
         if platform.system().lower() == "windows":
@@ -287,11 +287,25 @@ class UEProjectGenerationWorker(UEWorker):
             msg = f"Unreal Python not found at {python_path}"
             self.failed.emit(msg, 1)
             raise RuntimeError(msg)
-        pyside_cmd = [python_path.as_posix(),
-                      "-m",
-                      "pip",
-                      "install",
-                      "pyside2"]
+
+        pyside_version = "PySide2"
+        ue_version = self.ue_version.split(".")
+        if int(ue_version[0]) == 5 and int(ue_version[1]) >= 4:
+            pyside_version = "PySide6"
+
+        site_packages_prefix = python_path.parent.as_posix()
+
+        pyside_cmd = [
+            python_path.as_posix(),
+            "-m", "pip",
+            "install",
+            "--ignore-installed",
+            pyside_version,
+            "--prefix", site_packages_prefix,
+        ]
+
+        print(f"--- Installing {pyside_version} ...")
+        print(" ".join(pyside_cmd))
 
         pyside_install = subprocess.Popen(pyside_cmd,
                                           stdout=subprocess.PIPE,
@@ -306,8 +320,8 @@ class UEProjectGenerationWorker(UEWorker):
         return_code = pyside_install.wait()
 
         if return_code and return_code != 0:
-            msg = ("Failed to create the project! "
-                   "The installation of PySide2 has failed!")
+            msg = (f"Failed to create the project! {return_code} "
+                   f"The installation of {pyside_version} has failed!: {pyside_install}")
             self.failed.emit(msg, return_code)
             raise RuntimeError(msg)
 
diff --git a/pyproject.toml b/pyproject.toml
index c1f6ddfb0b..4726bef41a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -106,7 +106,7 @@ line-ending = "auto"
 
 [tool.codespell]
 # Ignore words that are not in the dictionary.
-ignore-words-list = "ayon,ynput,parms,parm,hda,developpement"
+ignore-words-list = "ayon,ynput,parms,parm,hda,developpement,ue"
 
 skip = "./.*,./package/*,*/vendor/*,*/unreal/integration/*,*/aftereffects/api/extension/js/libs/*"
 count = true

From 7c20ec0b564d5d3392dc558b48400144c56be8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Thu, 25 Apr 2024 15:31:15 +0200
Subject: [PATCH 2/3] :bug: downgrade PySide6 because of the bug

---
 client/ayon_core/hosts/unreal/ue_workers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/unreal/ue_workers.py b/client/ayon_core/hosts/unreal/ue_workers.py
index a987abcc83..cdac2c28af 100644
--- a/client/ayon_core/hosts/unreal/ue_workers.py
+++ b/client/ayon_core/hosts/unreal/ue_workers.py
@@ -291,7 +291,9 @@ class UEProjectGenerationWorker(UEWorker):
         pyside_version = "PySide2"
         ue_version = self.ue_version.split(".")
         if int(ue_version[0]) == 5 and int(ue_version[1]) >= 4:
-            pyside_version = "PySide6"
+            # Use PySide6 6.6.3 because 6.7.0 had a bug
+            #   - 'QPushButton' can't be added to 'QBoxLayout'
+            pyside_version = "PySide6==6.6.3"
 
         site_packages_prefix = python_path.parent.as_posix()
 

From 2c5a43dc931737c2e1aed2dfe6614545bb6c275f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Thu, 2 May 2024 11:42:46 +0200
Subject: [PATCH 3/3] :recycle: limit the site prefix only to windows

---
 client/ayon_core/hosts/unreal/ue_workers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/unreal/ue_workers.py b/client/ayon_core/hosts/unreal/ue_workers.py
index cdac2c28af..256c0557be 100644
--- a/client/ayon_core/hosts/unreal/ue_workers.py
+++ b/client/ayon_core/hosts/unreal/ue_workers.py
@@ -303,9 +303,12 @@ class UEProjectGenerationWorker(UEWorker):
             "install",
             "--ignore-installed",
             pyside_version,
-            "--prefix", site_packages_prefix,
+
         ]
 
+        if platform.system().lower() == "windows":
+            pyside_cmd += ["--target", site_packages_prefix]
+
         print(f"--- Installing {pyside_version} ...")
         print(" ".join(pyside_cmd))