diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-27 11:49:26 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-27 11:49:39 +0200 |
| commit | 3564db1585c88b43c3a1756e0e33b872289b0247 (patch) | |
| tree | 9f3c7f6e80fa87606c1445a70fcc2e990d11393a /scripts | |
| parent | f389117cd0abf4497d1dd2db53c530da6bfa37ad (diff) | |
| parent | 6f8badc5b6375dffb98ebee4d7a36130cc2bc35a (diff) | |
| download | meta-boot2qt-3564db1585c88b43c3a1756e0e33b872289b0247.tar.gz | |
Merge remote-tracking branch 'origin/krogoth' into dev
* origin/krogoth:
qtbase: bring back gbm PACKAGECONFIG
qt5: remove all sha1 overrides from qt5 module bbappends
Change-Id: I6b031c87554d5f304de140af28ebcaef048a6f17
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/manifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 64b893b..ac0bb87 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | path="sources/meta-openembedded"/> | 23 | path="sources/meta-openembedded"/> |
| 24 | <project name="meta-qt5" | 24 | <project name="meta-qt5" |
| 25 | remote="qtyocto" | 25 | remote="qtyocto" |
| 26 | revision="2c3f5e50233b30c1ab778b47cc8c57a9e7e10c3e" | 26 | revision="02dca2673dba478ee11bfbab62888d2cdbe961e4" |
| 27 | path="sources/meta-qt5"/> | 27 | path="sources/meta-qt5"/> |
| 28 | <project name="meta-mingw" | 28 | <project name="meta-mingw" |
| 29 | remote="qtyocto" | 29 | remote="qtyocto" |