mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[qt5] fix ambiguous option for vulkan feature (#23645)
qt5-base[vulkan] feature will introduce --vulkan=yes or --vulkan=no option, which redundants/confilicts with inherent option -no-vulkan, which is ambiguous in configure stage.
This commit is contained in:
parent
67f79d8799
commit
bea991d2c6
@ -127,7 +127,6 @@ list(APPEND CORE_OPTIONS
|
||||
-system-sqlite
|
||||
-system-harfbuzz
|
||||
-icu
|
||||
-no-vulkan
|
||||
-no-angle # Qt does not need to build angle. VCPKG will build angle!
|
||||
-no-glib
|
||||
)
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "qt5-base",
|
||||
"version": "5.15.3",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"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,
|
||||
|
@ -5642,7 +5642,7 @@
|
||||
},
|
||||
"qt5-base": {
|
||||
"baseline": "5.15.3",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"qt5-canvas3d": {
|
||||
"baseline": "0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "abaaa592badf33576f197d915ed1f4ddd91d0931",
|
||||
"version": "5.15.3",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "0b581b90072df50364b8c863110b2034a6b9f28e",
|
||||
"version": "5.15.3",
|
||||
|
Loading…
x
Reference in New Issue
Block a user