diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-03-21 13:03:58 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-03-21 13:06:39 +0200 |
| commit | 160bd85916f723ecdde8b0514c8a67fdeb4dfe73 (patch) | |
| tree | e6e92edead0d78aeaf5b879e5c26a90a99b98861 /meta-intel-extras/recipes | |
| parent | d481b98fe28e5bbb7d5e5a73f89abed1fedf4efb (diff) | |
| parent | 00b5087da9fa37ab49a29021bf4b1e405634a751 (diff) | |
| download | meta-boot2qt-160bd85916f723ecdde8b0514c8a67fdeb4dfe73.tar.gz | |
Merge remote-tracking branch 'origin/krogoth' into dev
* origin/krogoth:
AM: update revision
Add appman versions of Kit and Qt to creator
fonts: add recipe for GNU FreeFonts
Add multiscreen automotive demo
neptune: update to include fix for i18ndemo
fonts: update URL for lohit font
Update GammaRay to the same version as used by the QtAS 1.1 host tools
emulator: correctly append qtsimulator configuration
Update automotive components
setup-environment: don't exit the shell on error
neptune-ui: add runtime dependencies
update meta-qt5 (merged upstream/master) SHA1 to manifest.xml
AM: Add appman tools to automotive nativesdk
configure-qtcreator: suppress unnecessary error
Update GammaRay to the latest 2.7 branch
Conflicts:
recipes-qt/automotive/neptune-ui_git.bb
recipes-qt/automotive/qtapplicationmanager_git.bb
recipes-qt/qt5/qtlocation_git.bbappend
scripts/manifest.xml
Change-Id: I96601e7d7a1827a6631fe59d18101d2ad3b70871
Diffstat (limited to 'meta-intel-extras/recipes')
0 files changed, 0 insertions, 0 deletions