[pull] main from HIllya51:main

.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

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 
 

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}

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