aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2022-09-13 09:24:24 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-09-13 16:29:26 +0000
commit5a8ac5afd26d113366f86389f28c603b7f653548 (patch)
tree6ff45894afb27017283eb336f38ab89e5a8cb011
parentf978e5662a75cb8fc1740427917a326a2a6d1440 (diff)
ptest: fix test build with latest qml tools
Qml tools are now using --bare option, which limits where the tools tries to find the qml modules. For the test builds, we again need to use QT_ADDITIONAL_PACKAGES_PREFIX_PATH to tell the tools where to find qml files for the Qt module we are currently building. Task-number: QTBUG-106365 Change-Id: I6dfcd32f405475de0f58448cbaa7a19e26cbcfe8 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 63eeb3b83ea93f003baf3ff8ce300586778810df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--recipes-qt/qt6/qt6-ptest.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt6/qt6-ptest.inc b/recipes-qt/qt6/qt6-ptest.inc
index d66c427..c12c9bf 100644
--- a/recipes-qt/qt6/qt6-ptest.inc
+++ b/recipes-qt/qt6/qt6-ptest.inc
@@ -34,6 +34,7 @@ EOF
-DPython3_EXECUTABLE=${PYTHON} \
${EXTRA_OECMAKE} \
-DQT_BUILD_STANDALONE_TESTS=ON \
+ -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=${D}${QT6_INSTALL_LIBDIR}/cmake \
-DCMAKE_STAGING_PREFIX=${D}${prefix} \
-DCMAKE_SKIP_RPATH=ON \
-DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON \