From bf3a38fc0956231d1842a370843dec8d5fb37736 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 20:41:37 +0800
Subject: [PATCH 01/19] Revert "Update CMakeLists.txt"

This reverts commit 5c62debc5111d8836024537f028cd3d5a9447358.
---
 scripts/pyqt/pyproject.toml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/pyqt/pyproject.toml b/scripts/pyqt/pyproject.toml
index 3e48cf2..d6cc127 100644
--- a/scripts/pyqt/pyproject.toml
+++ b/scripts/pyqt/pyproject.toml
@@ -23,3 +23,13 @@ include-dirs = ["../../ElaWidgetTools/ElaWidgetTools"]
 sip-file = "ElaWidgetTools.sip"
 library-dirs = [ "../ElaWidgetTools/Release" ]
 libraries = [ "ElaWidgetTools" ]
+
+[tool.sip.builder]
+qmake-settings = [
+    "DEFINES += _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS",
+    "DEFINES += _HAS_CXX17=1",
+    "DEFINES += _HAS_CXX20=1",
+    "DEFINES += _CRT_SECURE_NO_WARNINGS",
+    "QMAKE_CXXFLAGS += /std:c++17",
+    "QMAKE_CXXFLAGS += /Zc:__cplusplus"
+]
\ No newline at end of file

From e69bd04ee439c11c3a75a93a9e35d3b6f0378b32 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 21:06:37 +0800
Subject: [PATCH 02/19] fix

---
 scripts/dobuild.py          | 12 ++++++++++++
 scripts/pyqt/pyproject.toml | 10 ----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index 23b8c2f..db8ceb3 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -109,6 +109,18 @@ def __parsefile(fn, cb):
                 '[ "ElaWidgetTools","D3D11", "DXGI", "kernel32" ,"user32", "gdi32", "winspool" ,"comdlg32", "advapi32", "shell32", "ole32", "oleaut32", "uuid", "odbc32", "odbccp32"]',
             ),
         )
+        if binding.lower() == "pyqt6":
+            fix = r"""
+[tool.sip.builder]
+qmake-settings = [
+    "DEFINES += _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS",
+    "DEFINES += _HAS_CXX17=1",
+    "DEFINES += _HAS_CXX20=1",
+    "DEFINES += _CRT_SECURE_NO_WARNINGS",
+    "QMAKE_CXXFLAGS += /std:c++17",
+    "QMAKE_CXXFLAGS += /Zc:__cplusplus"
+]"""
+            __parsefile("pyproject.toml", lambda c: c + fix)
     elif sys.platform == "linux":
         __parsefile(
             "pyproject.toml",
diff --git a/scripts/pyqt/pyproject.toml b/scripts/pyqt/pyproject.toml
index d6cc127..3e48cf2 100644
--- a/scripts/pyqt/pyproject.toml
+++ b/scripts/pyqt/pyproject.toml
@@ -23,13 +23,3 @@ include-dirs = ["../../ElaWidgetTools/ElaWidgetTools"]
 sip-file = "ElaWidgetTools.sip"
 library-dirs = [ "../ElaWidgetTools/Release" ]
 libraries = [ "ElaWidgetTools" ]
-
-[tool.sip.builder]
-qmake-settings = [
-    "DEFINES += _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS",
-    "DEFINES += _HAS_CXX17=1",
-    "DEFINES += _HAS_CXX20=1",
-    "DEFINES += _CRT_SECURE_NO_WARNINGS",
-    "QMAKE_CXXFLAGS += /std:c++17",
-    "QMAKE_CXXFLAGS += /Zc:__cplusplus"
-]
\ No newline at end of file

From 8b4a58c63a25144fe81c99fc3b411c81086edf4f 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 21:36:58 +0800
Subject: [PATCH 03/19] Revert "fix"

This reverts commit e69bd04ee439c11c3a75a93a9e35d3b6f0378b32.
---
 scripts/dobuild.py          | 12 ------------
 scripts/pyqt/pyproject.toml | 10 ++++++++++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index db8ceb3..23b8c2f 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -109,18 +109,6 @@ def __parsefile(fn, cb):
                 '[ "ElaWidgetTools","D3D11", "DXGI", "kernel32" ,"user32", "gdi32", "winspool" ,"comdlg32", "advapi32", "shell32", "ole32", "oleaut32", "uuid", "odbc32", "odbccp32"]',
             ),
         )
-        if binding.lower() == "pyqt6":
-            fix = r"""
-[tool.sip.builder]
-qmake-settings = [
-    "DEFINES += _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS",
-    "DEFINES += _HAS_CXX17=1",
-    "DEFINES += _HAS_CXX20=1",
-    "DEFINES += _CRT_SECURE_NO_WARNINGS",
-    "QMAKE_CXXFLAGS += /std:c++17",
-    "QMAKE_CXXFLAGS += /Zc:__cplusplus"
-]"""
-            __parsefile("pyproject.toml", lambda c: c + fix)
     elif sys.platform == "linux":
         __parsefile(
             "pyproject.toml",
diff --git a/scripts/pyqt/pyproject.toml b/scripts/pyqt/pyproject.toml
index 3e48cf2..d6cc127 100644
--- a/scripts/pyqt/pyproject.toml
+++ b/scripts/pyqt/pyproject.toml
@@ -23,3 +23,13 @@ include-dirs = ["../../ElaWidgetTools/ElaWidgetTools"]
 sip-file = "ElaWidgetTools.sip"
 library-dirs = [ "../ElaWidgetTools/Release" ]
 libraries = [ "ElaWidgetTools" ]
+
+[tool.sip.builder]
+qmake-settings = [
+    "DEFINES += _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS",
+    "DEFINES += _HAS_CXX17=1",
+    "DEFINES += _HAS_CXX20=1",
+    "DEFINES += _CRT_SECURE_NO_WARNINGS",
+    "QMAKE_CXXFLAGS += /std:c++17",
+    "QMAKE_CXXFLAGS += /Zc:__cplusplus"
+]
\ No newline at end of file

From 428174be4ee62389426d97620a8c69a5d2054812 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 21:38:48 +0800
Subject: [PATCH 04/19] Update dobuild.py

---
 scripts/dobuild.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index 23b8c2f..3735710 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -79,6 +79,20 @@ def __parsefile(fn, cb):
     flags = f'-G "Visual Studio 18 2026" -A {archA} -T host={arch}'
 else:
     flags = ""
+fix = r"""
+if(MSVC AND MSVC_VERSION GREATER_EQUAL 1940)  # VS2026 的 _MSC_VER 约为 1940+
+    message(STATUS "Detected VS2026 or newer, adding compatibility definitions")
+    add_compile_definitions(
+        _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS
+        _HAS_CXX17=1
+        _HAS_CXX20=1
+        _CRT_SECURE_NO_WARNINGS
+    )
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus")
+endif()
+
+"""
+__parsefile("../ElaWidgetTools/CMakeLists.txt", lambda c: c + fix)
 subprocess.run(
     f"cmake -DELAWIDGETTOOLS_BUILD_STATIC_LIB=ON ../ElaWidgetTools/CMakeLists.txt {flags}",
     shell=True,

From eaf81ff8d781ba6631141273b07f74017fb0a803 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 21:43:58 +0800
Subject: [PATCH 05/19] Update dobuild.py

---
 scripts/dobuild.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index 3735710..5e88cb0 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -79,20 +79,21 @@ def __parsefile(fn, cb):
     flags = f'-G "Visual Studio 18 2026" -A {archA} -T host={arch}'
 else:
     flags = ""
-fix = r"""
-if(MSVC AND MSVC_VERSION GREATER_EQUAL 1940)  # VS2026 的 _MSC_VER 约为 1940+
-    message(STATUS "Detected VS2026 or newer, adding compatibility definitions")
-    add_compile_definitions(
-        _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS
-        _HAS_CXX17=1
-        _HAS_CXX20=1
-        _CRT_SECURE_NO_WARNINGS
-    )
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus")
-endif()
+if sys.platform == "win32":
+    fix = r"""
+    if(MSVC AND MSVC_VERSION GREATER_EQUAL 1940)  # VS2026 的 _MSC_VER 约为 1940+
+        message(STATUS "Detected VS2026 or newer, adding compatibility definitions")
+        add_compile_definitions(
+            _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS
+            _HAS_CXX17=1
+            _HAS_CXX20=1
+            _CRT_SECURE_NO_WARNINGS
+        )
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus")
+    endif()
 
-"""
-__parsefile("../ElaWidgetTools/CMakeLists.txt", lambda c: c + fix)
+    """
+    __parsefile("../ElaWidgetTools/CMakeLists.txt", lambda c: c + fix)
 subprocess.run(
     f"cmake -DELAWIDGETTOOLS_BUILD_STATIC_LIB=ON ../ElaWidgetTools/CMakeLists.txt {flags}",
     shell=True,

From e0b4726b8ae8801c201e87876b6a5a8218203d79 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 21:51:24 +0800
Subject: [PATCH 06/19] fix

---
 scripts/dobuild.py          | 27 ++++++++++++---------------
 scripts/pyqt/pyproject.toml | 10 ----------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index 5e88cb0..96bd8d2 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -79,21 +79,6 @@ def __parsefile(fn, cb):
     flags = f'-G "Visual Studio 18 2026" -A {archA} -T host={arch}'
 else:
     flags = ""
-if sys.platform == "win32":
-    fix = r"""
-    if(MSVC AND MSVC_VERSION GREATER_EQUAL 1940)  # VS2026 的 _MSC_VER 约为 1940+
-        message(STATUS "Detected VS2026 or newer, adding compatibility definitions")
-        add_compile_definitions(
-            _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS
-            _HAS_CXX17=1
-            _HAS_CXX20=1
-            _CRT_SECURE_NO_WARNINGS
-        )
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus")
-    endif()
-
-    """
-    __parsefile("../ElaWidgetTools/CMakeLists.txt", lambda c: c + fix)
 subprocess.run(
     f"cmake -DELAWIDGETTOOLS_BUILD_STATIC_LIB=ON ../ElaWidgetTools/CMakeLists.txt {flags}",
     shell=True,
@@ -124,6 +109,18 @@ def __parsefile(fn, cb):
                 '[ "ElaWidgetTools","D3D11", "DXGI", "kernel32" ,"user32", "gdi32", "winspool" ,"comdlg32", "advapi32", "shell32", "ole32", "oleaut32", "uuid", "odbc32", "odbccp32"]',
             ),
         )
+        fix = r"""
+[tool.sip.builder]
+qmake-settings = [
+    "DEFINES += _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS",
+    "DEFINES += _HAS_CXX17=1",
+    "DEFINES += _HAS_CXX20=1",
+    "DEFINES += _CRT_SECURE_NO_WARNINGS",
+    "QMAKE_CXXFLAGS += /std:c++17",
+    "QMAKE_CXXFLAGS += /Zc:__cplusplus"
+]
+    """
+        __parsefile("pyproject.toml", lambda c: c + fix)
     elif sys.platform == "linux":
         __parsefile(
             "pyproject.toml",
diff --git a/scripts/pyqt/pyproject.toml b/scripts/pyqt/pyproject.toml
index d6cc127..3e48cf2 100644
--- a/scripts/pyqt/pyproject.toml
+++ b/scripts/pyqt/pyproject.toml
@@ -23,13 +23,3 @@ include-dirs = ["../../ElaWidgetTools/ElaWidgetTools"]
 sip-file = "ElaWidgetTools.sip"
 library-dirs = [ "../ElaWidgetTools/Release" ]
 libraries = [ "ElaWidgetTools" ]
-
-[tool.sip.builder]
-qmake-settings = [
-    "DEFINES += _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS",
-    "DEFINES += _HAS_CXX17=1",
-    "DEFINES += _HAS_CXX20=1",
-    "DEFINES += _CRT_SECURE_NO_WARNINGS",
-    "QMAKE_CXXFLAGS += /std:c++17",
-    "QMAKE_CXXFLAGS += /Zc:__cplusplus"
-]
\ No newline at end of file

From 67910f581f2d983a1327f9f42d743f05593606d4 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 22:00:42 +0800
Subject: [PATCH 07/19] Update dobuild.py

---
 scripts/dobuild.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index 96bd8d2..ccd1438 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -109,7 +109,8 @@ def __parsefile(fn, cb):
                 '[ "ElaWidgetTools","D3D11", "DXGI", "kernel32" ,"user32", "gdi32", "winspool" ,"comdlg32", "advapi32", "shell32", "ole32", "oleaut32", "uuid", "odbc32", "odbccp32"]',
             ),
         )
-        fix = r"""
+        if binding.lower() == "pyqt6":
+            fix = r"""
 [tool.sip.builder]
 qmake-settings = [
     "DEFINES += _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS",
@@ -120,7 +121,7 @@ def __parsefile(fn, cb):
     "QMAKE_CXXFLAGS += /Zc:__cplusplus"
 ]
     """
-        __parsefile("pyproject.toml", lambda c: c + fix)
+            __parsefile("pyproject.toml", lambda c: c + fix)
     elif sys.platform == "linux":
         __parsefile(
             "pyproject.toml",

From f23eb622efa3529dca80a28138070cec28aad3e9 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 22:13:09 +0800
Subject: [PATCH 08/19] Update dobuild.py

---
 scripts/dobuild.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index ccd1438..c4be46d 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -117,7 +117,7 @@ def __parsefile(fn, cb):
     "DEFINES += _HAS_CXX17=1",
     "DEFINES += _HAS_CXX20=1",
     "DEFINES += _CRT_SECURE_NO_WARNINGS",
-    "QMAKE_CXXFLAGS += /std:c++17",
+    "QMAKE_CXXFLAGS += /std:c++20",
     "QMAKE_CXXFLAGS += /Zc:__cplusplus"
 ]
     """

From e277faf8e406679288dfa7b6b571b7fc7b24dffe 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 22:18:40 +0800
Subject: [PATCH 09/19] Update dobuild.py

---
 scripts/dobuild.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index c4be46d..5430dc2 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -114,10 +114,11 @@ def __parsefile(fn, cb):
 [tool.sip.builder]
 qmake-settings = [
     "DEFINES += _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS",
+    "DEFINES += _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS",
     "DEFINES += _HAS_CXX17=1",
     "DEFINES += _HAS_CXX20=1",
     "DEFINES += _CRT_SECURE_NO_WARNINGS",
-    "QMAKE_CXXFLAGS += /std:c++20",
+    "QMAKE_CXXFLAGS += /std:c++17",
     "QMAKE_CXXFLAGS += /Zc:__cplusplus"
 ]
     """

From 3fb8c44dbb58d863abb3cc933769950c46d5d6ed 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 22:47:44 +0800
Subject: [PATCH 10/19] Update dobuild.py

---
 scripts/dobuild.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index 5430dc2..eadf8fb 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -77,6 +77,22 @@ def __parsefile(fn, cb):
 if sys.platform == "win32":
     archA = ("win32", "x64")[arch == "x64"]
     flags = f'-G "Visual Studio 18 2026" -A {archA} -T host={arch}'
+
+    if binding.lower() == "pyqt6":
+        fix = r"""
+    if(MSVC AND MSVC_VERSION GREATER_EQUAL 1940)  # VS2026 的 _MSC_VER 约为 1940+
+        message(STATUS "Detected VS2026 or newer, adding compatibility definitions")
+        add_compile_definitions(
+            _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS
+            _HAS_CXX17=1
+            _HAS_CXX20=1
+            _CRT_SECURE_NO_WARNINGS
+        )
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus")
+    endif()
+
+    """
+        __parsefile("../ElaWidgetTools/CMakeLists.txt", lambda c: c + fix)
 else:
     flags = ""
 subprocess.run(
@@ -109,20 +125,6 @@ def __parsefile(fn, cb):
                 '[ "ElaWidgetTools","D3D11", "DXGI", "kernel32" ,"user32", "gdi32", "winspool" ,"comdlg32", "advapi32", "shell32", "ole32", "oleaut32", "uuid", "odbc32", "odbccp32"]',
             ),
         )
-        if binding.lower() == "pyqt6":
-            fix = r"""
-[tool.sip.builder]
-qmake-settings = [
-    "DEFINES += _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS",
-    "DEFINES += _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS",
-    "DEFINES += _HAS_CXX17=1",
-    "DEFINES += _HAS_CXX20=1",
-    "DEFINES += _CRT_SECURE_NO_WARNINGS",
-    "QMAKE_CXXFLAGS += /std:c++17",
-    "QMAKE_CXXFLAGS += /Zc:__cplusplus"
-]
-    """
-            __parsefile("pyproject.toml", lambda c: c + fix)
     elif sys.platform == "linux":
         __parsefile(
             "pyproject.toml",

From 2ee865f4fff8382d23ca6af281d69ad0b42c3fe4 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:08:21 +0800
Subject: [PATCH 11/19] Update dobuild.py

---
 scripts/dobuild.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index eadf8fb..84b950c 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -56,11 +56,14 @@
 
 
 # 编译ela
-def __parsefile(fn, cb):
+def __parsefile(fn, cb, pr=False):
     with open(fn, "r", encoding="utf8") as ff:
         cml = ff.read()
     with open(fn, "w", encoding="utf8") as ff:
-        ff.write(cb(cml))
+        _ = cb(cml)
+        if pr:
+            print(_)
+        ff.write(_)
 
 
 __parsefile(
@@ -92,7 +95,14 @@ def __parsefile(fn, cb):
     endif()
 
     """
-        __parsefile("../ElaWidgetTools/CMakeLists.txt", lambda c: c + fix)
+        __parsefile(
+            "../ElaWidgetTools/CMakeLists.txt",
+            lambda c: c.replace(
+                "add_definitions(-DELAWIDGETTOOLS_LIBRARY)",
+                "add_definitions(-DELAWIDGETTOOLS_LIBRARY)\n" + fix,
+            ),
+            pr=True,
+        )
 else:
     flags = ""
 subprocess.run(

From b7ea0f145616c73c45541a82a8166647a8b06b6a 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:18:17 +0800
Subject: [PATCH 12/19] Update dobuild.py

---
 scripts/dobuild.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index 84b950c..a054cfb 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -1,4 +1,4 @@
-import sys, os, subprocess, shutil, site
+import sys, os, subprocess, shutil, site, io
 
 print(sys.platform)
 print(sys.executable)
@@ -54,6 +54,8 @@
         shell=True,
     )
 
+sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8", errors="replace")
+
 
 # 编译ela
 def __parsefile(fn, cb, pr=False):

From 9f6f49c5991de02a183e59dc480f0fc221b5b78d 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:25:05 +0800
Subject: [PATCH 13/19] fix

---
 README.md              | 2 +-
 scripts/dobuild.py     | 2 +-
 scripts/wheel/setup.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ddfac9b..30cd5ee 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.4.2
+PyQt6: `pip install PyQt6-ElaWidgetTools`，PyQt6>=6.5.0
 
 PySide6: `pip install PySide6-ElaWidgetTools`，PySide6==6.6.2 
 
diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index a054cfb..5929c8c 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -41,7 +41,7 @@
 if binding.lower().startswith("pyqt"):
     if qtversion.startswith("6"):
         subprocess.run(
-            f"{pyPath} -m pip install pyqt6==6.4.2 PyQt-builder sip", shell=True
+            f"{pyPath} -m pip install pyqt6==6.5.0 PyQt-builder sip", shell=True
         )
     else:
         subprocess.run(
diff --git a/scripts/wheel/setup.py b/scripts/wheel/setup.py
index 7b8751a..276b090 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.4.2"
+    req = "PyQt6>=6.5.0"
 elif bindingfor == "PySide6":
     pass
 

From f9db4081eae8a5f50dd14c12c8d271d911750433 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:31:46 +0800
Subject: [PATCH 14/19] Update build_internal.yml

---
 .github/workflows/build_internal.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_internal.yml b/.github/workflows/build_internal.yml
index 3ec7082..3fef836 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.4.3
+            version: 6.5.0
             pythonversion: 3.8.10
             arch: x64
             binding: PyQt6
@@ -51,7 +51,7 @@ jobs:
           - os: ubuntu-latest
             qthost: linux
             qtarch: gcc_64
-            version: 6.4.3
+            version: 6.5.0
             pythonversion: 3.8.12
             arch: x64
             binding: PyQt6

From cf1f9f1e5d590a806bc04d0c8b7b62d1707a58bd 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:35:47 +0800
Subject: [PATCH 15/19] fix

---
 .github/workflows/build_internal.yml | 4 ++--
 README.md                            | 2 +-
 scripts/dobuild.py                   | 2 +-
 scripts/wheel/setup.py               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_internal.yml b/.github/workflows/build_internal.yml
index 3fef836..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.5.0
+            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.5.0
+            version: 6.6.2
             pythonversion: 3.8.12
             arch: x64
             binding: PyQt6
diff --git a/README.md b/README.md
index 30cd5ee..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.5.0
+PyQt6: `pip install PyQt6-ElaWidgetTools`，PyQt6>=6.6.2
 
 PySide6: `pip install PySide6-ElaWidgetTools`，PySide6==6.6.2 
 
diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index 5929c8c..3338064 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -41,7 +41,7 @@
 if binding.lower().startswith("pyqt"):
     if qtversion.startswith("6"):
         subprocess.run(
-            f"{pyPath} -m pip install pyqt6==6.5.0 PyQt-builder sip", shell=True
+            f"{pyPath} -m pip install pyqt6==6.6.2 PyQt-builder sip", shell=True
         )
     else:
         subprocess.run(
diff --git a/scripts/wheel/setup.py b/scripts/wheel/setup.py
index 276b090..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.5.0"
+    req = "PyQt6>=6.6.2"
 elif bindingfor == "PySide6":
     pass
 

From a4464fa93a1b041bf5ffe3e4ea8fdfc604f740b7 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:42:05 +0800
Subject: [PATCH 16/19] Revert "fix"

This reverts commit cf1f9f1e5d590a806bc04d0c8b7b62d1707a58bd.
---
 .github/workflows/build_internal.yml | 4 ++--
 README.md                            | 2 +-
 scripts/dobuild.py                   | 2 +-
 scripts/wheel/setup.py               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_internal.yml b/.github/workflows/build_internal.yml
index c49823b..3fef836 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.2
+            version: 6.5.0
             pythonversion: 3.8.10
             arch: x64
             binding: PyQt6
@@ -51,7 +51,7 @@ jobs:
           - os: ubuntu-latest
             qthost: linux
             qtarch: gcc_64
-            version: 6.6.2
+            version: 6.5.0
             pythonversion: 3.8.12
             arch: x64
             binding: PyQt6
diff --git a/README.md b/README.md
index 600a14b..30cd5ee 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.2
+PyQt6: `pip install PyQt6-ElaWidgetTools`，PyQt6>=6.5.0
 
 PySide6: `pip install PySide6-ElaWidgetTools`，PySide6==6.6.2 
 
diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index 3338064..5929c8c 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -41,7 +41,7 @@
 if binding.lower().startswith("pyqt"):
     if qtversion.startswith("6"):
         subprocess.run(
-            f"{pyPath} -m pip install pyqt6==6.6.2 PyQt-builder sip", shell=True
+            f"{pyPath} -m pip install pyqt6==6.5.0 PyQt-builder sip", shell=True
         )
     else:
         subprocess.run(
diff --git a/scripts/wheel/setup.py b/scripts/wheel/setup.py
index d9465e6..276b090 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.2"
+    req = "PyQt6>=6.5.0"
 elif bindingfor == "PySide6":
     pass
 

From 78f8227394f9dd216a3725527f8e61bd64f2f9ab 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:42:20 +0800
Subject: [PATCH 17/19] fix

---
 .github/workflows/build_internal.yml | 4 ++--
 README.md                            | 2 +-
 scripts/dobuild.py                   | 2 +-
 scripts/wheel/setup.py               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_internal.yml b/.github/workflows/build_internal.yml
index 3fef836..16046fc 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.5.0
+            version: 6.6.1
             pythonversion: 3.8.10
             arch: x64
             binding: PyQt6
@@ -51,7 +51,7 @@ jobs:
           - os: ubuntu-latest
             qthost: linux
             qtarch: gcc_64
-            version: 6.5.0
+            version: 6.6.1
             pythonversion: 3.8.12
             arch: x64
             binding: PyQt6
diff --git a/README.md b/README.md
index 30cd5ee..10f6d17 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.5.0
+PyQt6: `pip install PyQt6-ElaWidgetTools`，PyQt6>=6.6.1
 
 PySide6: `pip install PySide6-ElaWidgetTools`，PySide6==6.6.2 
 
diff --git a/scripts/dobuild.py b/scripts/dobuild.py
index 5929c8c..a8836e6 100644
--- a/scripts/dobuild.py
+++ b/scripts/dobuild.py
@@ -41,7 +41,7 @@
 if binding.lower().startswith("pyqt"):
     if qtversion.startswith("6"):
         subprocess.run(
-            f"{pyPath} -m pip install pyqt6==6.5.0 PyQt-builder sip", shell=True
+            f"{pyPath} -m pip install pyqt6==6.6.1 PyQt-builder sip", shell=True
         )
     else:
         subprocess.run(
diff --git a/scripts/wheel/setup.py b/scripts/wheel/setup.py
index 276b090..f463353 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.5.0"
+    req = "PyQt6>=6.6.1"
 elif bindingfor == "PySide6":
     pass
 

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 18/19] 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 19/19] 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}