diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-08 09:18:57 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-08 13:07:17 +0200 |
| commit | 79029e538cebb72972e80b79dc596c122ad8c15b (patch) | |
| tree | 987104cbb19fcd7d1d89fc1e08f545f40afd4ee9 /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | 60c8b35f13f0969a2244e5ab06333fc3994ed221 (diff) | |
| parent | d6fe20e6083d421cc6091892e1d302c46e2d075d (diff) | |
Merge remote-tracking branch 'meta-qt5/master' into HEAD
* meta-qt5/master:
qtwebengine: enable ARMv7VE support
Add .gitignore to ignore .pyc/.pyo files
gdb: include readline in default PACKAGECONFIG
libconnman-qt5: update to 1.0.98
qtwebkit: backport patch to fix linking with qtwebkit
libconnman-qt5: remove blacklist
qtbase: fix up pkgconfig replacements
Conflicts:
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
Change-Id: I7dfa3f9828a9ef587676d4ce21e676679abc98ec
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 30168f43..32a6459d 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -47,6 +47,7 @@ COMPATIBLE_MACHINE_x86 = "(.*)" COMPATIBLE_MACHINE_x86-64 = "(.*)" COMPATIBLE_MACHINE_armv6 = "(.*)" COMPATIBLE_MACHINE_armv7a = "(.*)" +COMPATIBLE_MACHINE_armv7ve = "(.*)" inherit qmake5 inherit gettext |