diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-13 16:04:42 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-13 16:04:42 +0100 |
| commit | bb05449c26bff0394a54ffb864abf1412db3c237 (patch) | |
| tree | 5921e2d28e3f2845428b612e0a05d3780d33adad | |
| parent | ede15adc71f7f1c2acd63e96777b5d02d052a681 (diff) | |
| download | meta-qt5-bb05449c26bff0394a54ffb864abf1412db3c237.tar.gz | |
Revert "recipes: Use features_check instead of distro_features_check"
This reverts commit b7f4bd209c03c4f765cec84f4aa247819a6bb2f3.
I've accidentally merged this to zeus which doesn't have the feautres_check.bbclass
yet.
Even for master branch it's problematic, because some people tend to use different
branch of meta-qt5 with different OE releases, so if you need to use meta-qt5/master
with zeus or older, you'll need to introduce features_check.bbclass (with just
"inherit distro_features_check" in your own layer for the compatibility.
In the oposite case when using meta-qt5/zeus (or older) with master/dunfell, you'll
just get bunch of warnings about deprecated distro_features_check inherit which is
safe to ignore.
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 7cd006f5..61a55bff 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -81,7 +81,7 @@ inherit qmake5 | |||
| 81 | inherit gettext | 81 | inherit gettext |
| 82 | inherit pythonnative | 82 | inherit pythonnative |
| 83 | inherit perlnative | 83 | inherit perlnative |
| 84 | inherit features_check | 84 | inherit distro_features_check |
| 85 | 85 | ||
| 86 | # Static builds of QtWebEngine aren't supported. | 86 | # Static builds of QtWebEngine aren't supported. |
| 87 | CONFLICT_DISTRO_FEATURES = "qt5-static" | 87 | CONFLICT_DISTRO_FEATURES = "qt5-static" |