mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 11:21:12 +08:00
[qt5-tools] Fix build fail with mingw (#32707)
This commit is contained in:
parent
06cbd71e12
commit
d297fa0458
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "qt5-declarative",
|
"name": "qt5-declarative",
|
||||||
"version": "5.15.10",
|
"version": "5.15.10",
|
||||||
|
"port-version": 1,
|
||||||
"description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.",
|
"description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.",
|
||||||
"license": null,
|
"license": null,
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
@ -17,7 +18,7 @@
|
|||||||
"features": {
|
"features": {
|
||||||
"d3d12": {
|
"d3d12": {
|
||||||
"description": "Provides a Direct3D 12 backend for the scenegraph.",
|
"description": "Provides a Direct3D 12 backend for the scenegraph.",
|
||||||
"supports": "windows"
|
"supports": "windows & !mingw"
|
||||||
},
|
},
|
||||||
"platform-default-features": {
|
"platform-default-features": {
|
||||||
"description": "Enable platform-dependent default features",
|
"description": "Enable platform-dependent default features",
|
||||||
@ -27,7 +28,7 @@
|
|||||||
"features": [
|
"features": [
|
||||||
"d3d12"
|
"d3d12"
|
||||||
],
|
],
|
||||||
"platform": "windows"
|
"platform": "windows & !mingw"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
14
ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch
Normal file
14
ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
|
||||||
|
index de0dc73..eef68be 100644
|
||||||
|
--- a/src/designer/src/lib/lib.pro
|
||||||
|
+++ b/src/designer/src/lib/lib.pro
|
||||||
|
@@ -1,7 +1,8 @@
|
||||||
|
TARGET = QtDesigner
|
||||||
|
MODULE = designer
|
||||||
|
|
||||||
|
-QT = core-private gui-private widgets-private xml uiplugin
|
||||||
|
+QT = core-private gui-private widgets-private xml
|
||||||
|
+QT_PRIVATE += uiplugin
|
||||||
|
|
||||||
|
DEFINES += \
|
||||||
|
QDESIGNER_SDK_LIBRARY \
|
@ -1,6 +1,9 @@
|
|||||||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||||
|
|
||||||
qt_submodule_installation()
|
qt_submodule_installation(
|
||||||
|
PATCHES
|
||||||
|
"fix-pkgconfig-qt5uiplugin-not-found.patch"
|
||||||
|
)
|
||||||
|
|
||||||
if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
|
if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
|
||||||
file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms")
|
file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms")
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "qt5-tools",
|
"name": "qt5-tools",
|
||||||
"version": "5.15.10",
|
"version": "5.15.10",
|
||||||
|
"port-version": 1,
|
||||||
"description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications",
|
"description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications",
|
||||||
"license": null,
|
"license": null,
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
@ -6646,7 +6646,7 @@
|
|||||||
},
|
},
|
||||||
"qt5-declarative": {
|
"qt5-declarative": {
|
||||||
"baseline": "5.15.10",
|
"baseline": "5.15.10",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"qt5-doc": {
|
"qt5-doc": {
|
||||||
"baseline": "5.15.10",
|
"baseline": "5.15.10",
|
||||||
@ -6734,7 +6734,7 @@
|
|||||||
},
|
},
|
||||||
"qt5-tools": {
|
"qt5-tools": {
|
||||||
"baseline": "5.15.10",
|
"baseline": "5.15.10",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"qt5-translations": {
|
"qt5-translations": {
|
||||||
"baseline": "5.15.10",
|
"baseline": "5.15.10",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "c7cc59aec9e75dc548a741b01b94b13438904e99",
|
||||||
|
"version": "5.15.10",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "141dbdc4e7d234f55b336444a9e0a7f5add2e32b",
|
"git-tree": "141dbdc4e7d234f55b336444a9e0a7f5add2e32b",
|
||||||
"version": "5.15.10",
|
"version": "5.15.10",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "c3e934f75a0e506d6c3329e0fa0b2a56d6f71324",
|
||||||
|
"version": "5.15.10",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "994691ced838ba1d2eab1f5531e9ebfc4bd046f1",
|
"git-tree": "994691ced838ba1d2eab1f5531e9ebfc4bd046f1",
|
||||||
"version": "5.15.10",
|
"version": "5.15.10",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user