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 | |
| parent | 3cba80637fc17d3fd241ad930c743e009ed86d1a (diff) | |
| parent | b2c812bf50ba980d3b20e52c04c4dcc633cb1986 (diff) | |
| download | meta-qt5-374abadf749bbf8f3d84e2e895c2139722447a01.tar.gz | |
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
| -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 | |||
| 17 | instructions: | 17 | instructions: |
| 18 | - type: EnvironmentVariable | 18 | - type: EnvironmentVariable |
| 19 | variableName: POKY_SHA1 | 19 | variableName: POKY_SHA1 |
| 20 | variableValue: 1abffc542a0571f0d1512b92c1a59d138cf3ea6a | 20 | variableValue: 1adc7478a0548e1ebd75d96d2b938c5852c78365 |
| 21 | - type: EnvironmentVariable | 21 | - type: EnvironmentVariable |
| 22 | variableName: OE_SHA1 | 22 | variableName: OE_SHA1 |
| 23 | variableValue: b2baaae2711d098c06423858662e29a8375fe6b8 | 23 | variableValue: daa50331352c1f75da3a8ef6458ae3ddf94ef863 |
| 24 | - type: EnvironmentVariable | 24 | - type: EnvironmentVariable |
| 25 | variableName: PYTHON2_SHA1 | 25 | variableName: PYTHON2_SHA1 |
| 26 | variableValue: 8fc9be701d430388b4c5234c97e623debd26a1df | 26 | variableValue: 8fc9be701d430388b4c5234c97e623debd26a1df |