diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-14 08:46:40 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-14 08:47:17 +0300 |
commit | 374abadf749bbf8f3d84e2e895c2139722447a01 (patch) | |
tree | d1b9373e6448e8c8886ac8a6b6071fd0db7a40af /coin | |
parent | 3cba80637fc17d3fd241ad930c743e009ed86d1a (diff) | |
parent | b2c812bf50ba980d3b20e52c04c4dcc633cb1986 (diff) |
Merge remote-tracking branch 'qt/5.14' into 5.15
b2c812bf coin: update poky to 3.1_M3 from master
1aa8366b (tag: v5.14.2) qtbase: update module
6d8b91fe qt5: update submodules
cbf2529a qt5: update submodules
ef88f723 qt5: update submodules
Change-Id: I5923d74d8a0481ebcae11a06cb507ead9e73f87a
Diffstat (limited to 'coin')
-rw-r--r-- | coin/module_config.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 51579be0..e4ae70b8 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -17,10 +17,10 @@ environment: &environment instructions: - type: EnvironmentVariable variableName: POKY_SHA1 - variableValue: 1abffc542a0571f0d1512b92c1a59d138cf3ea6a + variableValue: 1adc7478a0548e1ebd75d96d2b938c5852c78365 - type: EnvironmentVariable variableName: OE_SHA1 - variableValue: b2baaae2711d098c06423858662e29a8375fe6b8 + variableValue: daa50331352c1f75da3a8ef6458ae3ddf94ef863 - type: EnvironmentVariable variableName: PYTHON2_SHA1 variableValue: 8fc9be701d430388b4c5234c97e623debd26a1df |