[qtbase] add thread feature

microsoft · May 25, 2022 · 2e6bcbb · 2e6bcbb
1 parent 93b3854
commit 2e6bcbb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
@@ -73,9 +73,9 @@ FEATURES
     "framework"           FEATURE_framework
     "concurrent"          FEATURE_concurrent
     "concurrent"          FEATURE_future
-    "concurrent"          FEATURE_thread
     "dbus"                FEATURE_dbus
     "gui"                 FEATURE_gui
+    "thread"              FEATURE_thread
     "network"             FEATURE_network
     "sql"                 FEATURE_sql
     "widgets"             FEATURE_widgets

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.3.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -63,6 +63,7 @@
     "sql-psql",
     "sql-sqlite",
     "testlib",
+    "thread",
     "widgets",
     "zstd"
   ],
@@ -84,7 +85,16 @@
       ]
     },
     "concurrent": {
-      "description": "Provides a high-level multi-threading API. Qt Concurrent"
+      "description": "Provides a high-level multi-threading API. Qt Concurrent",
+      "dependencies": [
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "thread"
+          ]
+        }
+      ]
     },
     "dbus": {
       "description": "Qt D-Bus"
@@ -167,6 +177,14 @@
           "features": [
             "freetype"
           ]
+        },
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "thread"
+          ],
+          "platform": "windows"
         }
       ]
     },
@@ -278,6 +296,9 @@
     "testlib": {
       "description": "Qt Testlib"
     },
+    "thread": {
+      "description": "Thread support; provides QThread and related classes."
+    },
     "vulkan": {
       "description": "Enable Vulkan support"
     },