diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-25 12:13:15 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-25 12:13:15 +0300 |
| commit | 429a8e9a0b720b2ca1e66fff921888bbdef3e378 (patch) | |
| tree | b6c7af9a86571c5e1e9d1097534cb5985d89e920 /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | 9195d9dc805fd3132023ff33bc77ace1f3f7e40f (diff) | |
| parent | 9aa870eecf6dc7a87678393bd55b97e21033ab48 (diff) | |
| download | meta-qt5-429a8e9a0b720b2ca1e66fff921888bbdef3e378.tar.gz | |
Merge remote-tracking branch 'gerrit/upstream/master' into 5.8
* gerrit/upstream/master:
qtbase: avoid qmake errors due to missing oe-device-extra.pri
Conflicts:
recipes-qt/qt5/qtbase_git.bb
Change-Id: Ib6975f5a7966ffbf9f96d40d69b89f226cd59040
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
0 files changed, 0 insertions, 0 deletions