From 5b8d9f8fa3888d26524fc07939bcc2e0d9825fbe Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 10 Sep 2025 08:41:24 +0000
Subject: [PATCH] examples: use matching REQUIRED_DISTRO_FEATURES

Match the REQUIRED_DISTRO_FEATURES for examples recipe to the
module recipes.

Fixes: QTBUG-140056
Change-Id: I2a199202a94bfa9503d522bdc6854c829957963d
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
---
 recipes-qt/qt6/qt3d-examples_git.bb        | 3 +++
 recipes-qt/qt6/qtdatavis3d-examples_git.bb | 3 +++
 recipes-qt/qt6/qtpdf-examples_git.bb       | 3 +++
 recipes-qt/qt6/qtvncserver-examples_git.bb | 2 +-
 recipes-qt/qt6/qtwayland-examples_git.bb   | 3 +++
 recipes-qt/qt6/qtwebengine-examples_git.bb | 3 +++
 recipes-qt/qt6/qtwebview-examples_git.bb   | 3 +++
 7 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/recipes-qt/qt6/qt3d-examples_git.bb b/recipes-qt/qt6/qt3d-examples_git.bb
index a6ebbb5..f9f1626 100644
--- a/recipes-qt/qt6/qt3d-examples_git.bb
+++ b/recipes-qt/qt6/qt3d-examples_git.bb
@@ -8,6 +8,9 @@ LIC_FILES_CHKSUM = " \
 NO_GENERIC_LICENSE[LicenseRef-MIRAMAR] = "LICENSES/LicenseRef-MIRAMAR.txt"
 
 inherit qt6-cmake
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
 
 QT_MODULE = "qt3d"
 
diff --git a/recipes-qt/qt6/qtdatavis3d-examples_git.bb b/recipes-qt/qt6/qtdatavis3d-examples_git.bb
index 4932e35..f1f1a37 100644
--- a/recipes-qt/qt6/qtdatavis3d-examples_git.bb
+++ b/recipes-qt/qt6/qtdatavis3d-examples_git.bb
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = " \
 "
 
 inherit qt6-cmake
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
 
 QT_MODULE = "qtdatavis3d"
 
diff --git a/recipes-qt/qt6/qtpdf-examples_git.bb b/recipes-qt/qt6/qtpdf-examples_git.bb
index 3c2bf7f..9a2fe44 100644
--- a/recipes-qt/qt6/qtpdf-examples_git.bb
+++ b/recipes-qt/qt6/qtpdf-examples_git.bb
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = " \
 "
 
 inherit qt6-cmake
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
 
 QT_MODULE = "qtwebengine"
 
diff --git a/recipes-qt/qt6/qtvncserver-examples_git.bb b/recipes-qt/qt6/qtvncserver-examples_git.bb
index e5a2001..db433f0 100644
--- a/recipes-qt/qt6/qtvncserver-examples_git.bb
+++ b/recipes-qt/qt6/qtvncserver-examples_git.bb
@@ -15,5 +15,5 @@ include recipes-qt/qt6/qt6-commercial.inc
 DEPENDS += "\
     qtdeclarative-native \
     qtvncserver \
-    qtwayland \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
 "
diff --git a/recipes-qt/qt6/qtwayland-examples_git.bb b/recipes-qt/qt6/qtwayland-examples_git.bb
index 9584b6f..e5dbf84 100644
--- a/recipes-qt/qt6/qtwayland-examples_git.bb
+++ b/recipes-qt/qt6/qtwayland-examples_git.bb
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = " \
 "
 
 inherit qt6-cmake
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "wayland"
 
 QT_MODULE = "qtwayland"
 
diff --git a/recipes-qt/qt6/qtwebengine-examples_git.bb b/recipes-qt/qt6/qtwebengine-examples_git.bb
index c0ae051..e6f161a 100644
--- a/recipes-qt/qt6/qtwebengine-examples_git.bb
+++ b/recipes-qt/qt6/qtwebengine-examples_git.bb
@@ -9,6 +9,9 @@ LIC_FILES_CHKSUM = " \
 NO_GENERIC_LICENSE[LicenseRef-Tango-Icons-Public-Domain] = "LICENSES/LicenseRef-Tango-Icons-Public-Domain.txt"
 
 inherit qt6-cmake
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
 
 QT_MODULE = "qtwebengine"
 
diff --git a/recipes-qt/qt6/qtwebview-examples_git.bb b/recipes-qt/qt6/qtwebview-examples_git.bb
index 78a1bf2..50078fe 100644
--- a/recipes-qt/qt6/qtwebview-examples_git.bb
+++ b/recipes-qt/qt6/qtwebview-examples_git.bb
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = " \
 "
 
 inherit qt6-cmake
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
 
 QT_MODULE = "qtwebview"