From 5b60f2d2137e0fb736fe882a9c037380d523cf33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=81=8D=E5=85=AE=E6=83=9A=E5=85=AE?= <101191390+HIllya51@users.noreply.github.com> Date: Thu, 9 Jul 2026 23:53:19 +0800 Subject: [PATCH 1/2] fix --- .github/workflows/build_internal.yml | 4 ++-- README.md | 2 +- scripts/wheel/setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_internal.yml b/.github/workflows/build_internal.yml index 16046fc..c49823b 100644 --- a/.github/workflows/build_internal.yml +++ b/.github/workflows/build_internal.yml @@ -30,7 +30,7 @@ jobs: - os: windows-latest qthost: windows qtarch: win64_msvc2019_64 - version: 6.6.1 + version: 6.6.2 pythonversion: 3.8.10 arch: x64 binding: PyQt6 @@ -51,7 +51,7 @@ jobs: - os: ubuntu-latest qthost: linux qtarch: gcc_64 - version: 6.6.1 + version: 6.6.2 pythonversion: 3.8.12 arch: x64 binding: PyQt6 diff --git a/README.md b/README.md index 10f6d17..600a14b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ PyQt5: `pip install PyQt5-ElaWidgetTools`,PyQt5>=5.15.5 -PyQt6: `pip install PyQt6-ElaWidgetTools`,PyQt6>=6.6.1 +PyQt6: `pip install PyQt6-ElaWidgetTools`,PyQt6>=6.6.2 PySide6: `pip install PySide6-ElaWidgetTools`,PySide6==6.6.2 diff --git a/scripts/wheel/setup.py b/scripts/wheel/setup.py index f463353..d9465e6 100644 --- a/scripts/wheel/setup.py +++ b/scripts/wheel/setup.py @@ -24,7 +24,7 @@ def has_ext_modules(self): if bindingfor == "PyQt5": req = "PyQt5>=5.15.5" elif bindingfor == "PyQt6": - req = "PyQt6>=6.6.1" + req = "PyQt6>=6.6.2" elif bindingfor == "PySide6": pass From 3617e8ed43722557de2724b56202dbbc4e9b1889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=81=8D=E5=85=AE=E6=83=9A=E5=85=AE?= <101191390+HIllya51@users.noreply.github.com> Date: Fri, 10 Jul 2026 00:12:42 +0800 Subject: [PATCH 2/2] Update gen_xml.py --- scripts/pyside6/gen_xml.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/scripts/pyside6/gen_xml.py b/scripts/pyside6/gen_xml.py index afe077f..6ed2ea5 100644 --- a/scripts/pyside6/gen_xml.py +++ b/scripts/pyside6/gen_xml.py @@ -289,22 +289,6 @@ def maybeparse(xx: str): ff.write(wrapperbase.format(internal=H_internal + "\n" + h)) -sysinclude = "" -if "msvc2019" in MY_QT_INSTALL: - # <=6.7必须使用msvc2019的头文件 - vspath = "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC" - if not os.path.exists(vspath): - vspath = ( - "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC" - ) - print(os.listdir(vspath)) - for _ in os.listdir(vspath): - if _.startswith("14.29"): - msvc2019 = _ - sysinclude = vspath + "/" + msvc2019 + "/include" - print(sysinclude) - sysinclude = f'--system-include-paths="{sysinclude}"' - if sys.platform=='linux': inc='/usr/lib/gcc/x86_64-linux-gnu/14/include' if not os.path.exists(inc): @@ -315,7 +299,7 @@ def maybeparse(xx: str): sysinclude = f' -I{inc} -I{pyDir} ' os.system( - f"""shiboken6 {sysinclude} + f"""shiboken6 --generator-set=shiboken --output-directory=OUTPUTDIR -I{ELA_INCLUDE_PATH}