summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2020-02-05 13:36:19 +0100
committerDominik Holland <dominik.holland@qt.io>2020-02-26 11:41:17 +0100
commit3e923004eb18feb5fde5c6832bd50d0ad5384af7 (patch)
tree90c2e51ed39603678dbf43e1f0a9cfc858b8bbc0
parent60d2093105e43b0fe352ebe3e9e7a6bed73b8b98 (diff)
downloadqtivi-3e923004eb18feb5fde5c6832bd50d0ad5384af7.tar.gz
Update qface to version 1.10.1
This makes sure pinned versions are used when installing all python dependencies, which is needed as a recent jinja update causes problems. Change-Id: Ia6cfed8169aca8eeac6809807772a448199c433c Fixes: AUTOSUITE-1440 Reviewed-by: Vladimir Minenko <vladimir.minenko@pelagicore.com> Reviewed-by: Robert Griebl <robert.griebl@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 26892fb308b7e3f3eb4b08cd1bb164f23dde15c4) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
m---------src/3rdparty/qface0
-rw-r--r--src/3rdparty/qt_attribution.json2
-rw-r--r--src/ivicore/configure.json4
3 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/qface b/src/3rdparty/qface
-Subproject 0a3ae7686e1100be452b8c435bdcd84ec242340
+Subproject dd40006b1cbf8f1f38af58f4997211b4b18c712
diff --git a/src/3rdparty/qt_attribution.json b/src/3rdparty/qt_attribution.json
index 6930599..e478cb7 100644
--- a/src/3rdparty/qt_attribution.json
+++ b/src/3rdparty/qt_attribution.json
@@ -7,7 +7,7 @@
"Description": "QFace is a generator framework based on a modern IDL.",
"Homepage": "https://pelagicore.github.io/qface",
- "Version": "1.10",
+ "Version": "1.10.1",
"License": "MIT",
"LicenseId": "MIT",
diff --git a/src/ivicore/configure.json b/src/ivicore/configure.json
index a86a389..cdb371f 100644
--- a/src/ivicore/configure.json
+++ b/src/ivicore/configure.json
@@ -24,10 +24,10 @@
"package": "virtualenv"
},
"qface": {
- "label": "qface 1.10",
+ "label": "qface 1.10.1",
"type": "python3_package",
"package": "qface",
- "version": "1.10"
+ "version": "1.10.1"
},
"qface-submodule": {
"label": "qface-submodule",