From 10f03f667af7bc821613e8052ed9893720391c6c Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 8 Jul 2025 09:16:03 +0000
Subject: [PATCH] ptest: include possible test plugins and qml modules

Some of the Qt modules have separate test plugins and qml modules
that are used in the auto tests.

Fixes: QTBUG-138066
Change-Id: I00c41396b59f1b380696bbab3489bd93b4a65cc5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 8c8ec98428fcbd92746040c95b124bfb64621c86)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1036144cce5b767b2bb181ea9e56a3d8ecf566a6)
(cherry picked from commit 70715f7d84ede7a7c467778bf08fc944e51775ed)
---
 recipes-qt/qt6/qt6-ptest.inc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/recipes-qt/qt6/qt6-ptest.inc b/recipes-qt/qt6/qt6-ptest.inc
index 68667a5..5db2c5c 100644
--- a/recipes-qt/qt6/qt6-ptest.inc
+++ b/recipes-qt/qt6/qt6-ptest.inc
@@ -53,6 +53,14 @@ EOF
             cp -r ${S}/tests/$tests ${D}${PTEST_PATH}/tests
         fi
     done
+
+    if [ -e "${B_PTEST}/${baselib}" ]; then
+        find ${B_PTEST}/${baselib} \
+            ! -type d -a \( -executable -o -name qmldir \) \
+            -exec sh -c '\
+                install -D "$1" "${D}${PTEST_PATH}${1#${B_PTEST}/${baselib}}" \
+            ' _ {} \;
+    fi
 }
 
 fakeroot python do_create_ptest_list() {
@@ -93,7 +101,7 @@ INSANE_SKIP:${PN}-ptest += "file-rdeps"
 
 PACKAGESPLITFUNCS =+ "remove_ptest_debug"
 remove_ptest_debug() {
-    if [ -e ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest/tests ]; then
-        find ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest/tests -depth -type d -name .debug -exec rm -rf '{}' \;
+    if [ -e ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest ]; then
+        find ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest -depth -type d -name .debug -exec rm -rf '{}' \;
     fi
 }