The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-22 18:47:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[qt5] update to QT5.12 (#4991)

Browse Source 
* update qt5-base to 5.12

* update modules to 5.12 (qt5-declarative and dependents don't work yet)

* fix qt5-declarative for 5.12 and some hashes.

* add qt5-declarative as dependency for qt5-graphicaleffects
This commit is contained in:
Lennart Trunk 2019-01-16 23:54:59 +01:00 committed by Phil Christensen
parent 672ea9a1b3
commit 13ec61a842
51 changed files with 68 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qt5-3d/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-3d
Version: 5.11.2
Version: 5.12.0
Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

2
ports/qt5-3d/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qt3d 706aa7e9a43d50823e8cd1e4838417a44761d6391ca3f8bae54d371742789ee63ba36e219c0a66ad3957ae0d68ed8e58c13f56a5f151b2d09e2c99e986aea4fe)
qt_modular_library(qt3d 4df1c07d5fce5771779bf8c43f41f97c8135702f606e7d0766bb17f8819057038b0b83366469ffbcef39e36a527a771d6905ae000f37ce67e6cad3a769e28eba)

2
ports/qt5-activeqt/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-activeqt
Version: 5.11.2
Version: 5.12.0
Description: Qt5 ActiveQt Module - ActiveX components
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-activeqt/portfile.cmake
View File

@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtactiveqt 50027f3429a4e9f140e259f228ea46420284a9632bba3ed92b9b44fbc1c168b6b2d039986d6a07e17ae1afff4f0aec3ccfe8a660322449a3258ab251c1910135)
qt_modular_library(qtactiveqt 439ba83a10763b29419d34bac42d11c59964e9d279cbee0faa51198cfbc91ef0fe60b4b96ea516dcdcc9bc6696599d266b406a0d5e9a6e182ca61df67349a11c)
#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts)

2
ports/qt5-base/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-base
Version: 5.11.2-1
Version: 5.12.0
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl

11
ports/qt5-base/fix-system-freetype.patch
View File

@ -1,12 +1,17 @@
---
src/gui/configure.json | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 28c8034..4c7c0a7 100644
index 0332631e..bd64b7b1 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -157,7 +157,7 @@
@@ -164,8 +164,7 @@
},
"sources": [
{ "type": "pkgConfig", "args": "freetype2" },
- { "type": "freetype", "libs": "-lfreetype" }
- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
- { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
+ { "libs": "-lfreetype" }
]
},

6
ports/qt5-base/portfile.cmake
View File

@ -11,14 +11,14 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
include(configure_qt)
include(install_qt)
set(MAJOR_MINOR 5.11)
set(FULL_VERSION ${MAJOR_MINOR}.2)
set(MAJOR_MINOR 5.12)
set(FULL_VERSION ${MAJOR_MINOR}.0)
set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz")
vcpkg_download_distfile(ARCHIVE_FILE
URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
FILENAME ${ARCHIVE_NAME}
SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
SHA512 8e6c51b754840d17e694b5b4a0d732afe04ebe48d166bca429db01ce3ac9014bb0ed35fe99ad165973889d96919f6b6774429585bae9a7fdba6b07f4c1eb3570
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH

2
ports/qt5-charts/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-charts
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-charts/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtcharts 19a9a0d78cba75d7ed237647c04237797b6002f9c6a4a08f4d4a90426bd44bdbde3f4ffc78dfafab3abb56faaef458a2577f5249200ad89e125e86049aafb85d)
qt_modular_library(qtcharts f8767dc019cf0b9a983e4fd61ac983184d7f4d3ad3cb748fc26a877892d537808eafc3f18815ba06761818e0fe5a74f0a048772fdac9ce86d7290a078f5e21aa)

2
ports/qt5-datavis3d/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-datavis3d
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-datavis3d/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtdatavis3d ec5599d95e30a9d6b4fbed53087aed4607a4ad5f8322610ec785c970a0c65b215344ec842c6c21791f27ec015610fca47e6af2608f2682ac2e6d114b0f0b80a8)
qt_modular_library(qtdatavis3d 6b88551e5ada11333a2202598d2c3732dccafafbf0dd7f245dee103137ca0bd3b547b47d3e6dd6929610764f520baa75cd92bf986493fcd57c7ce61e7d419204)

2
ports/qt5-declarative/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-declarative
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
Build-Depends: qt5-modularscripts, qt5-base

4
ports/qt5-declarative/portfile.cmake
View File

@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtdeclarative 30d3ddfabceaf48666cb5ebc5c3a25318152daeed599b1a0a1b3c2feff353708de4760472babbe55a685582c0640a2789fa2fa239d151d17fe2b36950836f7ee)
qt_modular_library(qtdeclarative 858d33bfcd5b87904bb08e0fec04665d3f43ed84de4f4336f4ef4ad2f2bd6d4ea79c048c8f8f8adfd4c30d6a9e01cd46175dc0e5a1335a000c57c0d0058999bd)
#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts)
#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts)

2
ports/qt5-gamepad/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-gamepad
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-gamepad/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtgamepad 65200780a7a27ca6fd6bd624b38c6568eacc2209816b3214ac2b63b5e510613cd492f846b5f67922aa5605eab1064e3e6ff060b610519e0546a0005736f55274)
qt_modular_library(qtgamepad bf412012b270b1fc594a8f139e5343f45d8b989cbc2d5eb02eb1c06817dd7ffd36706b14e3fa7691e4b4554b56c05e42899d28e278b1f1e0ca278842f46b8cfa)

4
ports/qt5-graphicaleffects/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-graphicaleffects
Version: 5.11.2
Version: 5.12.0
Description: Qt5 GraphicalEffects Module.
Build-Depends: qt5-modularscripts, qt5-base
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

2
ports/qt5-graphicaleffects/portfile.cmake
View File

@ -4,4 +4,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtgraphicaleffects a76bc46e6442fb66d0f99056c527593ff6df1336f24644fc6d265f21c5be3ff9329cdebb8b677b8b29e3a49fc98b90c9a5838a991ae998b81cda21028826071f)
qt_modular_library(qtgraphicaleffects 88545f9f11d5f97aa70b293539aa10b4e87bbf1f585ba57cbf337c0300b2cdad52ab9d25867a663714ae345c21006d10f567fdbb839df235a9faf7f7674a5835)

2
ports/qt5-imageformats/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-imageformats
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-imageformats/portfile.cmake
View File

@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtimageformats 9de3fa9ff8b985a89806ad33ed276454429aada01119d8f36b7d571f01d23c42afd588353fe62d80cf6b9b83b6c91d53ccbf61ed1ec4d66ddc0ce4f5719bdca1)
qt_modular_library(qtimageformats c83cfdb7e2c73c796d57e14c26bcf2b7d7d1b72413d0d0d632747f42748368d3538e2b1b2b896fe9ca2f58dda285b3452db42738911f26bad5413adea36a3f45)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

2
ports/qt5-modularscripts/CONTROL
View File

@ -1,3 +1,3 @@
Source: qt5-modularscripts
Version: 2018-11-01-1
Version: 2018-12-17
Description: Vcpkg helpers to package qt5 modules

8
ports/qt5-modularscripts/qt_modular_library.cmake
View File

@ -8,8 +8,8 @@ function(qt_modular_library NAME HASH)
)
endif()
set(MAJOR_MINOR 5.11)
set(FULL_VERSION ${MAJOR_MINOR}.2)
set(MAJOR_MINOR 5.12)
set(FULL_VERSION ${MAJOR_MINOR}.0)
set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz")
vcpkg_download_distfile(ARCHIVE_FILE
@ -40,7 +40,7 @@ function(qt_modular_library NAME HASH)
string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE)
string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE)
#Configure debug+release
vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH})
@ -135,4 +135,4 @@ function(qt_modular_library NAME HASH)
endif()
file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
endfunction()
endfunction()

2
ports/qt5-multimedia/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-multimedia
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

2
ports/qt5-multimedia/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtmultimedia f83c57ad35b713118d1d0ba27f78687aefa8f1ccd850be9b78a9c3477e0e9bb5f9a66bf39c2505f81987f0ca7d07dbc3f471d5efb4b9e4c21e41b308fc83040f)
qt_modular_library(qtmultimedia b16e657c73e57a8e5588697fda0e902834df10edd52704edcb7deb74fc45054ff9840344309ba720998d8afa6a5f315ce2bd46393ff8db6492694cfce0543692)

2
ports/qt5-networkauth/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-networkauth
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Network Authorization Module
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-networkauth/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtnetworkauth f723e8af1ab511f090d1830bf42899ec51b4a027a91c58c46179c16c9e635a3c3f51c13faf943936074ad768407824e57161e28d872868daaed6254c15fc852d)
qt_modular_library(qtnetworkauth ae00e338ff4b9b3233c821a28d59e601489554ce882e8a1dc22c0d7903fadbee182e1f9a43c3667b707581d196f5615042b230823e48c71a4f2b5d793183f1de)

2
ports/qt5-quickcontrols/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-quickcontrols
Version: 5.11.2
Version: 5.12.0
Description: Qt5 QuickControls Module.
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

2
ports/qt5-quickcontrols/portfile.cmake
View File

@ -4,4 +4,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtquickcontrols 621101df5966d74232edfe0ab1130968cf311a73e020604a4b329b412062599ab5a0f4f95a4d4c2bb6c2f91143485cd760dd6efac573dbd74f787361a99d5d25)
qt_modular_library(qtquickcontrols a2052398c281e81f8a61afe49f262d4feeb4da2593dbec0cc9971e7de6b169b17c1cf2ee7c213b3d5939cc322d4d715a1ce318b031fd4b8a783fac7bae3e37f9)

2
ports/qt5-quickcontrols2/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-quickcontrols2
Version: 5.11.2
Version: 5.12.0
Description: Qt5 QuickControls2 Module.
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

2
ports/qt5-quickcontrols2/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtquickcontrols2 94e8113feb222b85fa890fc65c59a371e29eb6838c2221b12d795d9809a605478f1c0b35a75b06bc67a02b3827dbb6bc4c4bf3fdd7485ee518cd0e5c409061a6)
qt_modular_library(qtquickcontrols2 e954832787fcb36cc3bab529b5ddf88ffa96d90924b9193a99e524831aff24026c9b278b4f3bb41afb2cc52a89888621637863ad0cda928901d9eb81e49017a5)

2
ports/qt5-script/CONTROL
View File

@ -1,3 +1,3 @@
Source: qt5-script
Version: 5.11.2
Version: 5.12.0
Description:Qt5 Script Module.

2
ports/qt5-script/portfile.cmake
View File

@ -2,4 +2,4 @@
include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtscript b0b4badc78cdebb3b42fe91104d112afd3bf9d4ead962c58ececa1db3db7fae6d5368f94d940195e2791ebfd09c5d6d5d892e9c4e48d64ec77dd366eddb1ab00)
qt_modular_library(qtscript f8870208fb0eb35551294739eabe9736a458e79fef1160b836031411b8055df7284339d301f2983c94b3bafeb15919fc575e12541c471655c0db9c0c5d85a087)

2
ports/qt5-scxml/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-scxml
Version: 5.11.2
Version: 5.12.0
Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

2
ports/qt5-scxml/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtscxml 4175d02224654a6a6b220f52937a22093be8b06e737f5575d4227b9038cb7c227f37eb17b7bb6878c16a34eae342c06e33cb2c356a389137e9f7d15886aa30ab)
qt_modular_library(qtscxml 4a50e6586a452bf0a0e9b40e969d00082c1bc88b50128d8ff211be4f03705e5a5aa3dcee062e9a635f6f520c6b1cbf52b4a68742d0b41409e1d9f650e76dbf49)

2
ports/qt5-serialport/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-serialport
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Serial Port - provides access to hardware and virtual serial ports
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-serialport/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtserialport babf89583fc025de511601f608300a01453e06c2eebe51c0d3cad3eb9c8179fa9cf9982690306ffaf7ce0a0abb7174ae0078a1fd36f6a34a2d5277bff9d4ea9d)
qt_modular_library(qtserialport b8004e844cab66a50f5c899af74f22e62dbac23493210d579344d4a9337990da9781c3647662e7f31b132b4c60d7e3de640a9a636ae7c63de253858324e11428)

2
ports/qt5-speech/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-speech
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Speech Module
Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows)

2
ports/qt5-speech/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtspeech b3e433b308c6c3454e40e7e19a075d1bd181a33ecea9c8f970852251488c12d1227e0b92aaeb6f7f75ac0efcb04bbe22c49562c594d8b9773528a2aaf73f8d02)
qt_modular_library(qtspeech cbc34d2d51ef2cf333dccd0a142198a477187786e743f6322370a197b4bbcba11ef7ce92aa9ea0917cc092f51609e71764ee3e5d356dadd54eaae5783c756887)

2
ports/qt5-svg/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-svg
Version: 5.11.2
Version: 5.12.0
Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-svg/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtsvg d6b83bc0c4b348f65890fbb4cd4df81828fb1ef88192c13b06dca695fe499d65da6a52ba57ca289aa31f035309f10af90593cd9ee17362219cfd1337cc801c57)
qt_modular_library(qtsvg 571e457dce3b62de5f316ab69fa0a9a9fd6a3ace8b05ae525ad5c82e6784b60f3c06f1ce94c3639c861639740b29d996fda6907ce77b60aeae916788313e0a65)

2
ports/qt5-tools/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-tools
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

4
ports/qt5-tools/portfile.cmake
View File

@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qttools a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5)
qt_modular_library(qttools 90ce900dc64856e994b05dba8a1f2735357d7cc489b0565beb2553c6007e0a53cedf363cbec96d9af325182f5a164eafe10d2d4d180ee72f544bf0fa9dbc671d)
#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts)
#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts)

2
ports/qt5-virtualkeyboard/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-virtualkeyboard
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-virtualkeyboard/portfile.cmake
View File

@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtvirtualkeyboard 1a471a719771c3a07b8d7b524692bdd085eae1787b8e91f523b224c260bc950b514ce88d885bbbe90c1556619bae15c59debfb221ec01042885d71443e046912)
qt_modular_library(qtvirtualkeyboard 984a4d8eb7fd4aaaee956c65e818467be93540769867023f6a9bb8a6d53bab7fe30d372aaa21cc3fb3642b9e6fa672669d4caacfaa0ed7500dcb126ee4be40f8)
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

2
ports/qt5-websockets/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-websockets
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-websockets/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtwebsockets 28fb4442a5e00c1aad8f7d3e9c6828030a76d7e396b1ecc7743925fb3981a2d900df9c25cbeecf3247d8d6a54a11083d979681cff1171bb0b680584e954e8fc3)
qt_modular_library(qtwebsockets 2c176fce2ad92d7c6c23047ea35a7e868d222abaea077f3d1d9e84ff5fccbaa198d1d0583f5686fdc99c71bea9c4a733cf0b718c65262e761e5f07a93452d186)

2
ports/qt5-winextras/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-winextras
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.
Build-Depends: qt5-modularscripts, qt5-base, atlmfc

2
ports/qt5-winextras/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtwinextras ac9ca4d188f7dadbdd124321cba39fb159f9225c23ab955c06ff3939080065a5e8f176f34504c59ae5fee602328550487187ed0648e7896dcd6bed698a6b45d8)
qt_modular_library(qtwinextras 37279e56c8317c2303d077d46ccb3780822e0853f9a2b92d3c9566077a977c2322ee46e9eca5f0f417624fe8ea4da03480fb905895dfb6b149a1c98b1caa3707)

2
ports/qt5-xmlpatterns/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-xmlpatterns
Version: 5.11.2
Version: 5.12.0
Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation
Build-Depends: qt5-modularscripts, qt5-base

2
ports/qt5-xmlpatterns/portfile.cmake
View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtxmlpatterns f659de3da93f83a215914a35b32dcd7d585cabae30044e8d512cbf2a29514043b18ad512e18e6de5b99546ddee2475d807f42e51baa46f15488841314372b26f)
qt_modular_library(qtxmlpatterns 9e9fe5d99957a0079eada985d8b9837cee27c0025851d00024951bb12cf23d0fb2483cbf3a39cb4c5a23b9d453e42d667b0434e73d87447d9b4e84a9dca37ece)

4
ports/qt5/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5
Version: 5.11.2
Version: 5.12.0
Description: Qt5 Application Framework
Build-Depends: qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-multimedia, qt5-networkauth, qt5-quickcontrols, qt5-quickcontrols2, qt5-scxml, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-websockets, qt5-3d, qt5-winextras, qt5-xmlpatterns
Build-Depends: qt5-3d, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-multimedia, qt5-networkauth, qt5-quickcontrols, qt5-quickcontrols2, qt5-scxml, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-websockets, qt5-winextras, qt5-xmlpatterns

4
scripts/cmake/vcpkg_build_qmake.cmake
View File

@ -51,7 +51,7 @@ function(vcpkg_build_qmake)
file(READ "${DEBUG_MAKEFILE}" _contents)
string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}")
string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}")
string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}")
string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib shell32.lib" _contents "${_contents}")
string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}")
string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}")
string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
@ -72,7 +72,7 @@ function(vcpkg_build_qmake)
foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES})
file(READ "${RELEASE_MAKEFILE}" _contents)
string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib qtmain.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link qtmain.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" _contents "${_contents}")
string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib shell32.lib" _contents "${_contents}")
string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}")
string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}")
string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")