diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-10-06 01:04:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 16:04:23 -0700 |
| commit | d9333c2143d12c291404b04a67240f2490b4b50c (patch) | |
| tree | 890a42fb7689c50acd40ada8fb60fb6894bee199 | |
| parent | 1b8c00cf98afc5bf964ab5a1430522f191237abb (diff) | |
| download | vcpkg-d9333c2143d12c291404b04a67240f2490b4b50c.tar.gz vcpkg-d9333c2143d12c291404b04a67240f2490b4b50c.zip | |
[qtbase/qttools] Fix missing feature dependencies. (#20528)
* [qttools] add missing feature dependency.
* version stuff
* assistant also requires sql-sqlite.
* version stuff
* qtbase add missing concurrent dependency
* update port version
* version stuff
| -rw-r--r-- | ports/qtbase/vcpkg.json | 12 | ||||
| -rw-r--r-- | ports/qttools/vcpkg.json | 24 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/q-/qtbase.json | 5 | ||||
| -rw-r--r-- | versions/q-/qttools.json | 5 |
5 files changed, 45 insertions, 5 deletions
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 876f3f43f..25f24be83 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version-semver": "6.2.0", + "port-version": 1, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ @@ -211,7 +212,16 @@ ] }, "sql": { - "description": "Qt Sql" + "description": "Qt Sql", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "concurrent" + ] + } + ] }, "sql-psql": { "description": "Enable SQL Driver psql", diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index cfdf1a272..9a806339d 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qttools", "version-semver": "6.2.0", + "port-version": 1, "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ @@ -20,10 +21,29 @@ ], "features": { "assistant": { - "description": "Build Qt Assistant" + "description": "Build Qt Assistant", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network", + "sql-sqlite" + ] + } + ] }, "designer": { - "description": "Build Qt Designer" + "description": "Build Qt Designer", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ] }, "linguist": { "description": "Build Qt Linguist components", diff --git a/versions/baseline.json b/versions/baseline.json index e7fd77ee6..318bbac4d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5554,7 +5554,7 @@ }, "qtbase": { "baseline": "6.2.0", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.2.0", @@ -5654,7 +5654,7 @@ }, "qttools": { "baseline": "6.2.0", - "port-version": 0 + "port-version": 1 }, "qttranslations": { "baseline": "6.2.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 9585acad1..657fa7a5e 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "01075dfd8097c54bd832400553958c2ff9bebf31", + "version-semver": "6.2.0", + "port-version": 1 + }, + { "git-tree": "9850138b57bf2122ee9e5063c76944754f4dbf63", "version-semver": "6.2.0", "port-version": 0 diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 3d380d693..8a4d30772 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7473cbd91e3a1f662866cd695e94ff6a96a9cfb4", + "version-semver": "6.2.0", + "port-version": 1 + }, + { "git-tree": "829976cbf157c36668dd1535bbeeadd2c1d39416", "version-semver": "6.2.0", "port-version": 0 |