aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorFei Chong <ZgblKylin@users.noreply.github.com>2021-04-30 04:01:42 +0800
committerGitHub <noreply@github.com>2021-04-29 13:01:42 -0700
commit2cfbf01199889ab30fc6e3b9d7fe37db6cb73566 (patch)
tree4b8cdf5b6455aae25ae2e8e75375396e43f6916d /versions
parent6537078e8ae397e5fb959e839c79e86c836065c2 (diff)
downloadvcpkg-2cfbf01199889ab30fc6e3b9d7fe37db6cb73566.tar.gz
vcpkg-2cfbf01199889ab30fc6e3b9d7fe37db6cb73566.zip
update osg-qt from Qt4 tag to master branch(Qt5) (#14761)
* update osg-qt from Qt4 tag to master brach(Qt5) * [osg-qt]: update version to Qt5#4 * Apply suggestions from code review * Update versions/baseline.json * Update versions/o-/osg-qt.json * Update versions/baseline.json * Update versions/o-/osg-qt.json Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/o-/osg-qt.json5
2 files changed, 7 insertions, 2 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index 1a7b4672d..f096dc3eb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4593,8 +4593,8 @@
"port-version": 7
},
"osg-qt": {
- "baseline": "Qt4",
- "port-version": 3
+ "baseline": "Qt5",
+ "port-version": 0
},
"osgearth": {
"baseline": "3.1",
diff --git a/versions/o-/osg-qt.json b/versions/o-/osg-qt.json
index d930d44bd..81eae086b 100644
--- a/versions/o-/osg-qt.json
+++ b/versions/o-/osg-qt.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "912b87e36bf6db14319d83e11d91286b6921675f",
+ "version-string": "Qt5",
+ "port-version": 0
+ },
+ {
"git-tree": "0cb876c38973571d755b0c92b17c8d1359027d07",
"version-string": "Qt4",
"port-version": 3