diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-01 10:47:02 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-05 10:17:31 +0200 |
commit | e91280bbcb99d7f4e3f79c2efe9c1fbc40b144fc (patch) | |
tree | 36b11f486cb876af80339d6b5d25e329a66127e3 /recipes-qt/qt5/qtwebengine_git.bbappend | |
parent | 1d3c81ea336f57add641e0fa3144de81af429f7e (diff) | |
parent | 07b4960e438f4eb772dde4d1ccac153785cf151e (diff) | |
download | meta-boot2qt-e91280bbcb99d7f4e3f79c2efe9c1fbc40b144fc.tar.gz |
Merge remote-tracking branch 'origin/morty' into pyro
Automotive related changes left intact for pyro, as they require
further work than just a basic merge due component branching
differences etc.
* origin/morty [MERGED]:
qt5: don't build tests by default
qbsp: fix replace tags
quickcompiler: update to 5.9.4 release revision
meta-qt5: update to Qt 5.9.4 RC
meta-qt5: update to Qt 5.9.4 snapshot
meta-qt5: update meta layer
poky: update revision
ppp: remove obsolete patch
meta-qt5: update meta layer
internal-build: prepend mirror variables
qtdeviceutilities: update revision
meta-qt5: update meta layer
poky: update revision
* origin/morty [NOT MERGED]:
Fix license checksum due to incremented year number
Update GammaRay revision
multiscreen-demo: update revision and fix startup
automotive: update revisions
sdk: add qtapplicationmanger staticdev package
qtivi: enable ivigenerator for toolchain
appman: add dependency to nativesdk-qtdeclarative
qtivi: Update to the latest version and add PACKAGECONFIG options for qtsimulator
Changes not staged for commit:
recipes-qt/automotive/gammaray_git.bb
recipes-qt/automotive/multiscreen-demo_git.bb
recipes-qt/automotive/qtapplicationmanager_git.bb
recipes-qt/automotive/qtivi_git.bb
recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
Conflicts:
recipes-qt/automotive/gammaray_git.bb
recipes-qt/automotive/neptune-ui_git.bb
recipes-qt/automotive/qtapplicationmanager_git.bb
recipes-qt/automotive/qtivi_git.bb
recipes-qt/qt5/qtdeviceutilities.bb
recipes-qt/qt5/qtquickcompiler_git.bb
scripts/manifest.xml
Task-number: QTBUG-65164
Change-Id: I98fe358aaaf55a609dc34f7b8cc65525d493ff26
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bbappend')
0 files changed, 0 insertions, 0 deletions