[qtwebview] fix core build (#30825)

microsoft · Apr 13, 2023 · 2a6dfa3 · 2a6dfa3
1 parent bd10ad0
commit 2a6dfa3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt",
   "version": "6.4.3",
+  "port-version": 1,
   "description": "Qt",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -182,10 +183,7 @@
     },
     {
       "name": "qtwebview",
-      "default-features": false,
-      "features": [
-        "qml"
-      ]
+      "default-features": false
     },
     {
       "name": "qtwebview",

diff --git a/ports/qtwebview/portfile.cmake b/ports/qtwebview/portfile.cmake
@@ -6,17 +6,13 @@ set(${PORT}_PATCHES)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 FEATURES
-    "qml"           CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
-    "qml"           CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebEngineQuick
     "webengine"     CMAKE_REQUIRE_FIND_PACKAGE_WebEngineCore
 INVERTED_FEATURES
-    "qml"           CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
-    "qml"           CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick
     "webengine"     CMAKE_DISABLE_FIND_PACKAGE_WebEngineCore
 )
 
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
-                     CONFIGURE_OPTIONS
+                     CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )
diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtwebview",
   "version": "6.4.3",
+  "port-version": 1,
   "description": "Qt Web View",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -11,18 +12,13 @@
       "features": [
         "gui"
       ]
+    },
+    {
+      "name": "qtdeclarative",
+      "default-features": false
     }
   ],
   "features": {
-    "qml": {
-      "description": "Build QML imports",
-      "dependencies": [
-        {
-          "name": "qtdeclarative",
-          "default-features": false
-        }
-      ]
-    },
     "webengine": {
       "description": "Build with Webengine",
       "supports": "!static",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6398,7 +6398,7 @@
     },
     "qt": {
       "baseline": "6.4.3",
-      "port-version": 0
+      "port-version": 1
     },
     "qt-advanced-docking-system": {
       "baseline": "3.8.2",
@@ -6758,7 +6758,7 @@
     },
     "qtwebview": {
       "baseline": "6.4.3",
-      "port-version": 0
+      "port-version": 1
     },
     "quadtree": {
       "baseline": "2022-04-24",

diff --git a/versions/q-/qt.json b/versions/q-/qt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6e93109d6a3a6a6ef65470ce467a01a931a723b9",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "01393fc66b4bf4414a40b6dfe895e025c1778fe6",
       "version": "6.4.3",

diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cef8861fee214027a5ade446692eafb6490fb7ea",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "9b5466522d3ff72530716724384c7122f4ffe8c1",
       "version": "6.4.3",