aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2021-01-15 15:22:01 -0800
committerGitHub <noreply@github.com>2021-01-15 15:22:01 -0800
commit21b569f3e6773554b9e8284318c118bce0426f7b (patch)
tree51839cecae321cfc6e55a3a35f31d7b394740663
parent6df7d6612bf7c1ee983748dfe53196e8c983ff78 (diff)
downloadvcpkg-21b569f3e6773554b9e8284318c118bce0426f7b.tar.gz
vcpkg-21b569f3e6773554b9e8284318c118bce0426f7b.zip
[qt5] Remove dependency qt5 feature mysqlplugin when building x86 (#15597)
* [qt5] Remove dependency qt5 feature mysqlplugin * Update ports/qt5/CONTROL * Update ports/qt5/CONTROL * [qt5] update baseline
-rw-r--r--port_versions/baseline.json2
-rw-r--r--port_versions/q-/qt5.json5
-rw-r--r--ports/qt5/CONTROL4
3 files changed, 8 insertions, 3 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json
index c4e06c2fe..0d7dc02a5 100644
--- a/port_versions/baseline.json
+++ b/port_versions/baseline.json
@@ -4702,7 +4702,7 @@
},
"qt5": {
"baseline": "5.15.1",
- "port-version": 1
+ "port-version": 2
},
"qt5-3d": {
"baseline": "5.15.1",
diff --git a/port_versions/q-/qt5.json b/port_versions/q-/qt5.json
index a9699009b..4b97cb92d 100644
--- a/port_versions/q-/qt5.json
+++ b/port_versions/q-/qt5.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "6c44bc778ae3e400ff6f777d6f6bb68c24a81fed",
+ "version-string": "5.15.1",
+ "port-version": 2
+ },
+ {
"git-tree": "800137391209a8e9acbff74fb129f05192e159a8",
"version-string": "5.15.1",
"port-version": 1
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index b881ffd17..aa4a394a0 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,9 +1,9 @@
Source: qt5
Version: 5.15.1
-Port-Version: 1
+Port-Version: 2
Homepage: https://www.qt.io/
Description: Qt5 Application Framework
-Build-Depends: qt5-base[core,mysqlplugin]
+Build-Depends: qt5-base[core]
Default-Features: essentials
Feature: essentials