diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-06-06 13:15:13 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-06-07 08:46:21 +0300 |
| commit | dc32862fb82686c30722970619ad1187695e6e60 (patch) | |
| tree | a97b03b18a4fee394c758a99182285c71be73921 /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | a5671981cdb9115605a87905d2fb919a86cea244 (diff) | |
| parent | 1100037b9becaaa5749602bca9d63693119c4585 (diff) | |
Merge remote-tracking branch 'upstream/krogoth' into 5.6
* upstream/krogoth:
qtwebkit: depends on gperf-native
cmake_qt5.bbclass: add qtbase-native to DEPENDS
Update Qt5's git repositories to match new locations
qtwebengine: Add gperf-native to DEPENDS
qtwayland: Fix building of QWaylandIntegration if some Qt5 features are disabled.
qt5: update submodules
qtbase: avoid qmake errors due to missing oe-device-extra.pri
qtdeclarative: add upstream patch to fix QtQml crash with GCC 6
Conflicts:
recipes-qt/qt5/qtbase_git.bb
Change-Id: Ic773b1eaa0d5c84316352ae41d7ec5cd2d5c8048
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 532ae75e..1e903ae2 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -16,6 +16,7 @@ DEPENDS += " \ qtlocation \ libdrm fontconfig pixman openssl pango cairo icu pciutils \ libcap \ + gperf-native \ " # when qtbase is built with xcb enabled (default with x11 in DISTRO_FEATURES), |