diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh index 023ac1930fe..0bda9755f48 100755 --- a/.docker/docker-qgis-build.sh +++ b/.docker/docker-qgis-build.sh @@ -108,6 +108,7 @@ cmake \ -DWITH_PDAL=ON \ -DWITH_QTSERIALPORT=ON \ -DWITH_QTWEBKIT=${WITH_QT5} \ + -DWITH_QTWEBENGINE=${WITH_QTWEBENGINE} \ -DWITH_OAUTH2_PLUGIN=${WITH_QT5} \ -DORACLE_INCLUDEDIR=/instantclient_19_9/sdk/include/ \ -DORACLE_LIBDIR=/instantclient_19_9/ \ diff --git a/.docker/qgis3-qt6-build-deps.dockerfile b/.docker/qgis3-qt6-build-deps.dockerfile index fc74b3bb37a..4edb3320631 100644 --- a/.docker/qgis3-qt6-build-deps.dockerfile +++ b/.docker/qgis3-qt6-build-deps.dockerfile @@ -49,6 +49,7 @@ RUN dnf -y --refresh install \ qt6-qtdeclarative-devel \ qt6-qt5compat-devel \ qt6-qtmultimedia-devel \ + qt6-qtwebengine-devel \ qtkeychain-qt6-devel \ qwt-qt6-devel \ qscintilla-qt6-devel \ diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 620df40bfbb..c7e89a762f5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -52,6 +52,7 @@ jobs: with-clazy: ON with-grass7: OFF with-grass8: OFF + with-webengine: OFF with-compile-commands: ON # LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so experimental: false @@ -67,6 +68,7 @@ jobs: with-clazy: OFF with-grass7: OFF with-grass8: ON + with-webengine: ON with-compile-commands: OFF LD_PRELOAD: '' experimental: false @@ -178,6 +180,7 @@ jobs: --env WITH_3D=${{ matrix.with-3d }} \ --env WITH_GRASS7=${{ matrix.with-grass7 }} \ --env WITH_GRASS8=${{ matrix.with-grass8 }} \ + --env WITH_QTWEBENGINE=${{ matrix.with-webengine }} \ --env LD_PRELOAD=${{ matrix.LD_PRELOAD }} \ --env WITH_CLAZY=${{ matrix.with-clazy }} \ --env WITH_COMPILE_COMMANDS=${{ matrix.with-compile-commands }} \