diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-05 10:03:27 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-05 10:03:27 +0300 |
| commit | fe1bc76ad4cc4e114a639ca94716cfd24f0b5ad5 (patch) | |
| tree | d007fed4c6c9f33c41573550e76fc325b040b59b /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | 0ab7116f9cbb93b3132481731db296245044fbff (diff) | |
| parent | 0263af75c053d1d7ea4882a75cf59b230fbb88ad (diff) | |
| download | meta-qt5-fe1bc76ad4cc4e114a639ca94716cfd24f0b5ad5.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
qt5: add option to build Qt5 statically
qtbase: fix install locations used in static builds
qttranslations: do not use qt meta catalog translation package
qttools: Disable clang support
qtbase: add PACKAGECONFIG for Link Time Optimization
qt5: remove all references to qtquick1 import path
qt5/qtscript: Fix qtscript cross compile error
README: Add Yocto Project Compatible badge and fix formatting
Change-Id: Ic8cb74f6e87634b26f79c9effffb80deb6a51b6b
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 2dfb50a5..d6565c85 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -73,6 +73,10 @@ inherit qmake5 | |||
| 73 | inherit gettext | 73 | inherit gettext |
| 74 | inherit pythonnative | 74 | inherit pythonnative |
| 75 | inherit perlnative | 75 | inherit perlnative |
| 76 | inherit distro_features_check | ||
| 77 | |||
| 78 | # Static builds of QtWebEngine aren't supported. | ||
| 79 | CONFLICT_DISTRO_FEATURES = "qt5-static" | ||
| 76 | 80 | ||
| 77 | # we don't want gettext.bbclass to append --enable-nls | 81 | # we don't want gettext.bbclass to append --enable-nls |
| 78 | def gettext_oeconf(d): | 82 | def gettext_oeconf(d): |