From 93a7ef060fdc11c888736b6a75f84825766c1cfe 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: Mon, 27 Jul 2026 14:53:32 +0800
Subject: [PATCH 01/13] Update and rename gen_xml.py to gcc

---
 scripts/pyside6/{gen_xml.py => gcc} | 1 +
 1 file changed, 1 insertion(+)
 rename scripts/pyside6/{gen_xml.py => gcc} (99%)

diff --git a/scripts/pyside6/gen_xml.py b/scripts/pyside6/gcc
similarity index 99%
rename from scripts/pyside6/gen_xml.py
rename to scripts/pyside6/gcc
index 6ed2ea5..8212ea4 100644
--- a/scripts/pyside6/gen_xml.py
+++ b/scripts/pyside6/gcc
@@ -290,6 +290,7 @@ def maybeparse(xx: str):
 
 
 if sys.platform=='linux':
+    print(os.listdir('/usr/lib/gcc/x86_64-linux-gnu/'))
     inc='/usr/lib/gcc/x86_64-linux-gnu/14/include'
     if not os.path.exists(inc):
         inc='/usr/lib/gcc/x86_64-linux-gnu/11/include'

From 1f612c3cdce92d106c107cb7f7c206594fc9fd84 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: Mon, 27 Jul 2026 15:07:55 +0800
Subject: [PATCH 02/13] shit

---
 scripts/pyside6/{gcc => gen_xml.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename scripts/pyside6/{gcc => gen_xml.py} (100%)

diff --git a/scripts/pyside6/gcc b/scripts/pyside6/gen_xml.py
similarity index 100%
rename from scripts/pyside6/gcc
rename to scripts/pyside6/gen_xml.py

From db0d39668b9a5aa3fd55d29b71f88a92ab6ed9ad 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: Mon, 27 Jul 2026 15:22:23 +0800
Subject: [PATCH 03/13] Update CMakeLists.txt

---
 scripts/pyside6/CMakeLists.txt | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/scripts/pyside6/CMakeLists.txt b/scripts/pyside6/CMakeLists.txt
index 86770e1..e283d2d 100644
--- a/scripts/pyside6/CMakeLists.txt
+++ b/scripts/pyside6/CMakeLists.txt
@@ -19,17 +19,6 @@ set(CMAKE_PREFIX_PATH ${MY_QT_INSTALL})
 set(CMAKE_BUILD_TYPE Release)
 
 
-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()
-
 
 message(STATUS "Python3_ROOT_DIR: ${Python3_ROOT_DIR}")
 message(STATUS "Python3_EXECUTABLE: ${Python3_EXECUTABLE}")

From 3afa4124ad2ebfca5d99e08b70e7f291dfcfc48b 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: Mon, 27 Jul 2026 15:22:37 +0800
Subject: [PATCH 04/13] Update CMakeLists.txt

---
 scripts/pyside6/CMakeLists.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/pyside6/CMakeLists.txt b/scripts/pyside6/CMakeLists.txt
index e283d2d..86770e1 100644
--- a/scripts/pyside6/CMakeLists.txt
+++ b/scripts/pyside6/CMakeLists.txt
@@ -19,6 +19,17 @@ set(CMAKE_PREFIX_PATH ${MY_QT_INSTALL})
 set(CMAKE_BUILD_TYPE Release)
 
 
+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()
+
 
 message(STATUS "Python3_ROOT_DIR: ${Python3_ROOT_DIR}")
 message(STATUS "Python3_EXECUTABLE: ${Python3_EXECUTABLE}")

From 33b6872a305a330261ff95de6b3a72ac473fc244 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: Mon, 27 Jul 2026 15:26:13 +0800
Subject: [PATCH 05/13] Update gen_xml.py

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

diff --git a/scripts/pyside6/gen_xml.py b/scripts/pyside6/gen_xml.py
index 8212ea4..18dc6ec 100644
--- a/scripts/pyside6/gen_xml.py
+++ b/scripts/pyside6/gen_xml.py
@@ -289,6 +289,7 @@ def maybeparse(xx: str):
     ff.write(wrapperbase.format(internal=H_internal + "\n" + h))
 
 
+sysinclude = ""
 if sys.platform=='linux':
     print(os.listdir('/usr/lib/gcc/x86_64-linux-gnu/'))
     inc='/usr/lib/gcc/x86_64-linux-gnu/14/include'
@@ -300,7 +301,7 @@ def maybeparse(xx: str):
     sysinclude = f' -I{inc} -I{pyDir} '
 
 os.system(
-    f"""shiboken6 
+    f"""shiboken6 {sysinclude}
         --generator-set=shiboken
         --output-directory=OUTPUTDIR
         -I{ELA_INCLUDE_PATH}

From 5ab48a0d0e55ca3825837d5f166db1176ba8b5fc 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: Mon, 27 Jul 2026 15:30:33 +0800
Subject: [PATCH 06/13] Update build_internal.yml

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

diff --git a/.github/workflows/build_internal.yml b/.github/workflows/build_internal.yml
index c49823b..aadf6c9 100644
--- a/.github/workflows/build_internal.yml
+++ b/.github/workflows/build_internal.yml
@@ -85,7 +85,11 @@ jobs:
         with:
           python-version: 3.12.10
           architecture: x64
-      
+      - if: matrix.binding == 'PySide6' && matrix.qtarch == 'win64_msvc2019_64'
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          vsversion: 2019
+          arch: x64
       - uses: seanmiddleditch/gha-setup-vsdevenv@master
         with:
           arch: ${{ matrix.arch }}
@@ -96,4 +100,4 @@ jobs:
       - uses: actions/upload-artifact@v7
         with:
           name: ${{matrix.qthost}}_${{ matrix.binding }}_${{ matrix.arch }}
-          path: scripts/objects
\ No newline at end of file
+          path: scripts/objects

From 6f91f74fdbb0b5d8068d4b06c98313a6a8cd9f11 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: Mon, 27 Jul 2026 15:31:41 +0800
Subject: [PATCH 07/13] Update gen_xml.py

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

diff --git a/scripts/pyside6/gen_xml.py b/scripts/pyside6/gen_xml.py
index 18dc6ec..f719364 100644
--- a/scripts/pyside6/gen_xml.py
+++ b/scripts/pyside6/gen_xml.py
@@ -290,6 +290,20 @@ def maybeparse(xx: str):
 
 
 sysinclude = ""
+if "msvc2019" in MY_QT_INSTALL:
+    # <=6.7必须使用msvc2019的头文件
+    vspath = "C:/Program Files/Microsoft Visual Studio/18/Community/VC/Tools/MSVC"
+    if not os.path.exists(vspath):
+        vspath = (
+            "C:/Program Files/Microsoft Visual Studio/18/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':
     print(os.listdir('/usr/lib/gcc/x86_64-linux-gnu/'))
     inc='/usr/lib/gcc/x86_64-linux-gnu/14/include'

From 1df53066c0c4afa1328b0af833e505ef74cc58c8 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: Mon, 27 Jul 2026 15:40:25 +0800
Subject: [PATCH 08/13] Update build_internal.yml

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

diff --git a/.github/workflows/build_internal.yml b/.github/workflows/build_internal.yml
index aadf6c9..c726e6a 100644
--- a/.github/workflows/build_internal.yml
+++ b/.github/workflows/build_internal.yml
@@ -85,14 +85,15 @@ jobs:
         with:
           python-version: 3.12.10
           architecture: x64
+      - if: matrix.qthost == 'windows'
+        uses: seanmiddleditch/gha-setup-vsdevenv@master
+        with:
+          arch: ${{ matrix.arch }}
       - if: matrix.binding == 'PySide6' && matrix.qtarch == 'win64_msvc2019_64'
         uses: ilammy/msvc-dev-cmd@v1
         with:
           vsversion: 2019
           arch: x64
-      - uses: seanmiddleditch/gha-setup-vsdevenv@master
-        with:
-          arch: ${{ matrix.arch }}
       - run: python scripts/dobuild.py ${{matrix.pythonversion}} ${{ matrix.qtarch }}  ${{ matrix.version }} ${{ matrix.arch }}  ${{matrix.binding}}
       - uses: actions/attest-build-provenance@v4
         with:

From 057195befb8fc5297a0432f730c6acf9d140b60b 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: Mon, 27 Jul 2026 16:15:04 +0800
Subject: [PATCH 09/13] Update build_internal.yml

---
 .github/workflows/build_internal.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_internal.yml b/.github/workflows/build_internal.yml
index c726e6a..90b10ab 100644
--- a/.github/workflows/build_internal.yml
+++ b/.github/workflows/build_internal.yml
@@ -90,7 +90,7 @@ jobs:
         with:
           arch: ${{ matrix.arch }}
       - if: matrix.binding == 'PySide6' && matrix.qtarch == 'win64_msvc2019_64'
-        uses: ilammy/msvc-dev-cmd@v1
+        uses: step-security/msvc-dev-cmd@v1
         with:
           vsversion: 2019
           arch: x64

From 001bfc7fa56c3c3ff325317ad8cac10b300e6c6c 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: Mon, 27 Jul 2026 16:34:39 +0800
Subject: [PATCH 10/13] Replace MSVC command setup with MSBuild setup

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

diff --git a/.github/workflows/build_internal.yml b/.github/workflows/build_internal.yml
index 90b10ab..73099b0 100644
--- a/.github/workflows/build_internal.yml
+++ b/.github/workflows/build_internal.yml
@@ -90,10 +90,7 @@ jobs:
         with:
           arch: ${{ matrix.arch }}
       - if: matrix.binding == 'PySide6' && matrix.qtarch == 'win64_msvc2019_64'
-        uses: step-security/msvc-dev-cmd@v1
-        with:
-          vsversion: 2019
-          arch: x64
+        uses: warrenbuckley/Setup-MSBuild@v1
       - run: python scripts/dobuild.py ${{matrix.pythonversion}} ${{ matrix.qtarch }}  ${{ matrix.version }} ${{ matrix.arch }}  ${{matrix.binding}}
       - uses: actions/attest-build-provenance@v4
         with:

From b3a798bf58ed83883564908b3dd0814f14d41f8a 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: Mon, 27 Jul 2026 16:44:58 +0800
Subject: [PATCH 11/13] Update build_internal.yml

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

diff --git a/.github/workflows/build_internal.yml b/.github/workflows/build_internal.yml
index 73099b0..bf5e2d8 100644
--- a/.github/workflows/build_internal.yml
+++ b/.github/workflows/build_internal.yml
@@ -90,7 +90,10 @@ jobs:
         with:
           arch: ${{ matrix.arch }}
       - if: matrix.binding == 'PySide6' && matrix.qtarch == 'win64_msvc2019_64'
-        uses: warrenbuckley/Setup-MSBuild@v1
+        uses: TheMrMilchmann/setup-msvc-dev@v4
+        with:
+          arch: x64
+          toolset: 14.29
       - run: python scripts/dobuild.py ${{matrix.pythonversion}} ${{ matrix.qtarch }}  ${{ matrix.version }} ${{ matrix.arch }}  ${{matrix.binding}}
       - uses: actions/attest-build-provenance@v4
         with:

From 7c0b1933013e2771be9f8104c5b6eaa7aa17dfcc 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: Mon, 27 Jul 2026 16:57:19 +0800
Subject: [PATCH 12/13] Update CMakeLists.txt

---
 scripts/pyside6/CMakeLists.txt | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/scripts/pyside6/CMakeLists.txt b/scripts/pyside6/CMakeLists.txt
index 86770e1..e283d2d 100644
--- a/scripts/pyside6/CMakeLists.txt
+++ b/scripts/pyside6/CMakeLists.txt
@@ -19,17 +19,6 @@ set(CMAKE_PREFIX_PATH ${MY_QT_INSTALL})
 set(CMAKE_BUILD_TYPE Release)
 
 
-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()
-
 
 message(STATUS "Python3_ROOT_DIR: ${Python3_ROOT_DIR}")
 message(STATUS "Python3_EXECUTABLE: ${Python3_EXECUTABLE}")

From 00461ad1f83400c3c295b1b7fef030cea4b6e707 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: Mon, 27 Jul 2026 17:07:58 +0800
Subject: [PATCH 13/13] Update setup.py

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

diff --git a/scripts/wheel/setup.py b/scripts/wheel/setup.py
index d9465e6..3de1600 100644
--- a/scripts/wheel/setup.py
+++ b/scripts/wheel/setup.py
@@ -7,7 +7,7 @@
 bit = sys.argv[-1]
 sys.argv.pop(-1)
 
-version="0.11.0"
+version="0.11.1"
 
 req = "PySide6"