diff --git a/local/recipes/qt/qtwayland/recipe.toml b/local/recipes/qt/qtwayland/recipe.toml index 221594dd14..42bc2d28a6 100644 --- a/local/recipes/qt/qtwayland/recipe.toml +++ b/local/recipes/qt/qtwayland/recipe.toml @@ -69,6 +69,18 @@ fi redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +# Copy Qt6 wayland protocol XMLs from qtbase staging (not propagated by cookbook) +QTBASE_STAGE="${COOKBOOK_ROOT}/local/recipes/qt/qtbase/target/x86_64-unknown-redox/stage/usr" +if [ -d "${QTBASE_STAGE}/share/qt6/wayland/protocols" ]; then + mkdir -p "${COOKBOOK_SYSROOT}/usr/share/qt6/wayland" + cp -a "${QTBASE_STAGE}/share/qt6/wayland/protocols" \ + "${COOKBOOK_SYSROOT}/usr/share/qt6/wayland/protocols" +elif [ -d "${COOKBOOK_SYSROOT}/usr/share/qt6/wayland/protocols" ]; then + : +else + echo "WARNING: Qt6 wayland protocols not found — text-input/v2 generation will fail" +fi + cmake "${COOKBOOK_SOURCE}" \ -DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" \ -DQT_HOST_PATH="${HOST_BUILD}" \