upstream QCA with open SSL support

m-kuhn · Apr 15, 2024 · 6646e7f · 6646e7f
1 parent 28bcb2a
commit 6646e7f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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 @@
       ]
     }
   }
-