3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[qt5-base] Remove duplicate flags qt (#31634)

Browse Source 
* remove GMAKE_CXXFLAGS_RELEASE from qmodule.pri

* version db

* version

* version

* remove check for qmodule.pri

* version db
This commit is contained in:
Javier Matos Denizac 2023-06-13 14:58:22 -07:00 committed by GitHub
parent d9f54117ed
commit dcd04502ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/qt5-base/cmake/qt_build_submodule.cmake
View File

@ -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()

1
ports/qt5-base/vcpkg.json
View File

@ -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,

2
versions/baseline.json
View File

@ -6570,7 +6570,7 @@
},
"qt5-base": {
"baseline": "5.15.10",
"port-version": 0
"port-version": 1
},
"qt5-canvas3d": {
"baseline": "0",

5
versions/q-/qt5-base.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3088e8df941cddfdc7dd5a5b6efae7386cb3d388",
"version": "5.15.10",
"port-version": 1
},
{
"git-tree": "a90de4f154709723b9a837d25b1572ca33f2a8b4",
"version": "5.15.10",