From 4da2c3ff0aedabd0b2f5eb1a751b9a58a72b3d5b Mon Sep 17 00:00:00 2001
From: Vinluo <945640045@qq.com>
Date: Fri, 12 Jun 2026 15:40:00 +0800
Subject: [PATCH] Fix Qt build with newer MSVC STL

---
 .../3rdparty/qt/include/QtCore/qcompilerdetection.h       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/qrenderdoc/3rdparty/qt/include/QtCore/qcompilerdetection.h b/qrenderdoc/3rdparty/qt/include/QtCore/qcompilerdetection.h
index 231ac2c9b..0b0f3c5c9 100644
--- a/qrenderdoc/3rdparty/qt/include/QtCore/qcompilerdetection.h
+++ b/qrenderdoc/3rdparty/qt/include/QtCore/qcompilerdetection.h
@@ -105,10 +105,14 @@
 #  endif
 #  define Q_DECL_EXPORT __declspec(dllexport)
 #  define Q_DECL_IMPORT __declspec(dllimport)
-#  if _MSC_VER >= 1800
+#  if _MSC_VER >= 1940
+#    define QT_MAKE_UNCHECKED_ARRAY_ITERATOR(x) (x)
+#  elif _MSC_VER >= 1800
 #    define QT_MAKE_UNCHECKED_ARRAY_ITERATOR(x) stdext::make_unchecked_array_iterator(x)
 #  endif
-#  if _MSC_VER >= 1500
+#  if _MSC_VER >= 1940
+#    define QT_MAKE_CHECKED_ARRAY_ITERATOR(x, N) (x)
+#  elif _MSC_VER >= 1500
 #    define QT_MAKE_CHECKED_ARRAY_ITERATOR(x, N) stdext::make_checked_array_iterator(x, size_t(N))
 #  endif
 /* Intel C++ disguising as Visual C++: the `using' keyword avoids warnings */