From dcd04502ecb573e0f0480870435a0677678fdec8 Mon Sep 17 00:00:00 2001
From: Javier Matos Denizac <javier.matosd@gmail.com>
Date: Tue, 13 Jun 2023 14:58:22 -0700
Subject: [PATCH] [qt5-base] Remove duplicate flags qt (#31634)

* remove GMAKE_CXXFLAGS_RELEASE from qmodule.pri

* version db

* version

* version

* remove check for qmodule.pri

* version db
---
 ports/qt5-base/cmake/qt_build_submodule.cmake | 5 +++++
 ports/qt5-base/vcpkg.json                     | 1 +
 versions/baseline.json                        | 2 +-
 versions/q-/qt5-base.json                     | 5 +++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake
index 24e6385cfb..9801136a92 100644
--- a/ports/qt5-base/cmake/qt_build_submodule.cmake
+++ b/ports/qt5-base/cmake/qt_build_submodule.cmake
@@ -123,4 +123,9 @@ function(qt_build_submodule SOURCE_PATH)
         endif()
     endif()
 
+    # Remove duplicate flags from qmodule.pri issue -> https://github.com/microsoft/vcpkg/issues/28835
+    file(READ "${CURRENT_INSTALLED_DIR}/tools/qt5/mkspecs/qmodule.pri" QMODULE_PRI_CONTENT)
+    string(REGEX REPLACE "QMAKE_CXXFLAGS_RELEASE\\+=[^\n]*\n" "QMAKE_CXXFLAGS_RELEASE=\n" QMODULE_PRI_CONTENT ${QMODULE_PRI_CONTENT})
+    file(WRITE "${CURRENT_INSTALLED_DIR}/tools/qt5/mkspecs/qmodule.pri" "${QMODULE_PRI_CONTENT}")
+
 endfunction()
\ No newline at end of file
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index 724f7b1a4f..e6c83a8010 100644
--- a/ports/qt5-base/vcpkg.json
+++ b/ports/qt5-base/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt5-base",
   "version": "5.15.10",
+  "port-version": 1,
   "description": "Qt5 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
index d6de21bf45..fb1aa5420b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6570,7 +6570,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.10",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-canvas3d": {
       "baseline": "0",
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index 5e97804505..beac80539c 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3088e8df941cddfdc7dd5a5b6efae7386cb3d388",
+      "version": "5.15.10",
+      "port-version": 1
+    },
     {
       "git-tree": "a90de4f154709723b9a837d25b1572ca33f2a8b4",
       "version": "5.15.10",