diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a72abe56bda..bbabfdc8521e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ ############################################################# # CMake settings cmake_minimum_required(VERSION 3.12.0) -set(VCPKG_TAG e105a86c97b8ab13d4dbe3f7bd9ebc17ece31634) +set(VCPKG_TAG ad3bae57455a3c3ce528fcd47d8e8027d0498add) set(CMAKE_COLOR_MAKEFILE ON) set(CMAKE_AUTORCC ON) # set path to additional CMake modules diff --git a/vcpkg/.qt6/vcpkg.json b/vcpkg/.qt6/vcpkg.json index 81cdce3cc44d..c525a927197e 100644 --- a/vcpkg/.qt6/vcpkg.json +++ b/vcpkg/.qt6/vcpkg.json @@ -33,7 +33,11 @@ "jhasse-poly2tri", "proj", "protobuf", - "qca", + { + "name": "qca", + "default-features": false, + "features": ["ossl"] + }, "qtbase", "qtlocation", "qtsvg", @@ -101,7 +105,7 @@ "vcpkg-configuration": { "default-registry": { "kind": "git", - "baseline": "e105a86c97b8ab13d4dbe3f7bd9ebc17ece31634", + "baseline": "ad3bae57455a3c3ce528fcd47d8e8027d0498add", "repository": "https://github.com/microsoft/vcpkg" }, "registries": [ @@ -115,7 +119,7 @@ "vcpkg-python-scripts" ] } - ], + ], "overlay-ports": [ "../ports" ], @@ -124,4 +128,3 @@ ] } } - \ No newline at end of file