diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-10-14 13:07:44 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-10-14 13:26:34 +0300 |
| commit | d63820dd03b527ee09141c636e474d9ceff7545b (patch) | |
| tree | ae6b50d7dfbb8b3aae697a7d2a18518c35ae06ba /scripts | |
| parent | 87a7f6539f6bd00087f6aaf3a2514054069bbd87 (diff) | |
| parent | a8c49af2fa8e64dd6f913d597eb3ac2611c966b4 (diff) | |
| download | meta-boot2qt-d63820dd03b527ee09141c636e474d9ceff7545b.tar.gz | |
Merge remote-tracking branch 'origin/dizzy' into dev
* origin/dizzy:
Patch and update ostree
Build nativesdk-ostree
gstreamer: fix audio volume plugin
Revert "toradex: move to V2.4 branch"
Add ostree, dracut and libgsystem recipes.
otf-noto: update url and add correct license
qt5: add workaround for gcc's internal compiler error
Use 5.5.1 branch for meta-qt5
qt5: use the new base bbclass to get qt.conf generated
qt5-addons: update source revisions
b2qt-addons: update source revisions
Fix font file access rights
Change-Id: Iea75ad7f958e2ae72e6d40ff35dd8b669d4730ce
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/manifest_qt5.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml index 69eb254..1e4f902 100644 --- a/scripts/manifest_qt5.xml +++ b/scripts/manifest_qt5.xml | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | <project name="meta-qt5" | 8 | <project name="meta-qt5" |
| 9 | remote="playground" | 9 | remote="playground" |
| 10 | revision="5.5-next" | 10 | revision="5.5.1" |
| 11 | path="sources/meta-qt5"/> | 11 | path="sources/meta-qt5"/> |
| 12 | 12 | ||
| 13 | </manifest> | 13 | </manifest> |