[qtbase] clang source location fix (#31360)

* [qtbase] clang feeling insecure about __cpp_consteval * v db * v db
microsoft · Jun 22, 2023 · 6258ccf · 6258ccf
1 parent b0bd92a
commit 6258ccf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch
@@ -7,7 +7,7 @@ index 823b2057b..4a8cd4fa8 100644
  #include <QtCore/qpropertyprivate.h>
 
 -#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC)
-+#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC) && defined(__cpp_consteval)
++#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC) && ( (defined(__cpp_consteval) && defined(_MSC_VER)) || !defined(_MSC_VER) )
  #include <source_location>
  #if defined(__cpp_lib_source_location)
  #define QT_SOURCE_LOCATION_NAMESPACE std

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.5.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6762,7 +6762,7 @@
     },
     "qtbase": {
       "baseline": "6.5.1",
-      "port-version": 2
+      "port-version": 3
     },
     "qtcharts": {
       "baseline": "6.5.1",

diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "198ba2cfff57e3ccc7a2f6f40002127d8d0abb6e",
+      "version": "6.5.1",
+      "port-version": 3
+    },
     {
       "git-tree": "384ddcfe175f58d6f498c91f6b8e790bb6ad70ac",
       "version": "6.5.1",