diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-03 08:34:04 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-03 08:34:50 +0200 |
| commit | 37530865c423547ebec5ece5a3e1d7233d3ddbc2 (patch) | |
| tree | 66bfe242ca6f25180beae1d6b21b4d0284e02640 /scripts | |
| parent | a2f8538312a7a213950685d9560105c7503df6cc (diff) | |
| parent | 4c82d2041fdd90cea9ffd61a2af49d4e52376369 (diff) | |
| download | meta-boot2qt-37530865c423547ebec5ece5a3e1d7233d3ddbc2.tar.gz | |
Merge remote-tracking branch 'origin/dizzy' into dev
* origin/dizzy:
VKB: use correct SHA1 for v1.3.1
qt5: add qt addons dev packages to the toolchain
qtquickcompiler: add dev packages to toolchain
Go back to branch 5.5 in b2qt-demos build
qt5: use jethro branch for meta-qt5
qt5: oe-device-extra.pri is now supported in upstream
Change-Id: Ib369f45fe6644d4e44e24e7850c3dfe7431d31f4
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 5f0c16c..9fc0bf6 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | path="sources/meta-openembedded"/> | 22 | path="sources/meta-openembedded"/> |
| 23 | <project name="meta-qt5" | 23 | <project name="meta-qt5" |
| 24 | remote="meta-qt5" | 24 | remote="meta-qt5" |
| 25 | revision="51b4620392aa9041d8512549bfa554bea368c5ea" | 25 | revision="89038bffd224a0d43aa8627472374503b3023f61" |
| 26 | path="sources/meta-qt5"/> | 26 | path="sources/meta-qt5"/> |
| 27 | 27 | ||
| 28 | <project name="meta-fsl-arm" | 28 | <project name="meta-fsl-arm" |