Skip to content

Commit

Permalink
[qtbase] Make feature pcre2 to hard dependency when install static li…
Browse files Browse the repository at this point in the history
…brary (#22584)

* [qtbase] Add fatal error to remind install feature pcre2 when install static library

* update version

* update feature pcre2 to hard dependency

* update version

* update vcpkg.json

* update version

* make feature doubleconversion to hare dependency

* format vcpkg.json

* update version

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
  • Loading branch information
LilyWangLL and Lily Wang committed Jan 26, 2022
1 parent bd97a0c commit ef5c753
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
18 changes: 17 additions & 1 deletion ports/qtbase/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "qtbase",
"version-semver": "6.2.2",
"port-version": 2,
"port-version": 3,
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"dependencies": [
Expand All @@ -16,6 +16,22 @@
"host": true,
"default-features": false
},
{
"name": "qtbase",
"default-features": false,
"features": [
"doubleconversion"
],
"platform": "windows"
},
{
"name": "qtbase",
"default-features": false,
"features": [
"pcre2"
],
"platform": "windows & static"
},
"zlib"
],
"default-features": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5750,7 +5750,7 @@
},
"qtbase": {
"baseline": "6.2.2",
"port-version": 2
"port-version": 3
},
"qtcharts": {
"baseline": "6.2.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtbase.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e9fa18e04e930f9ada49aac4dca2e9fe4958b89a",
"version-semver": "6.2.2",
"port-version": 3
},
{
"git-tree": "bb6485a4e65e52d1a157f6e0c478a47bdc884726",
"version-semver": "6.2.2",
Expand Down

0 comments on commit ef5c753

Please sign in to comment.