From 0653e13e0b513b205ac8bfb0e3f59fdb0c135d59 Mon Sep 17 00:00:00 2001 From: Mathieu Pellerin Date: Fri, 26 Apr 2024 19:45:21 +0700 Subject: [PATCH] [layout] Fix html item freeze QGIS when loading HTML undet Qt6/QtWebkit-less environments --- src/core/layout/qgslayoutitemhtml.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/layout/qgslayoutitemhtml.cpp b/src/core/layout/qgslayoutitemhtml.cpp index 1f15a6ec3707..98a2a8b89a8a 100644 --- a/src/core/layout/qgslayoutitemhtml.cpp +++ b/src/core/layout/qgslayoutitemhtml.cpp @@ -241,6 +241,7 @@ void QgsLayoutItemHtml::loadHtml( const bool useCache, const QgsExpressionContex if ( !loaded ) loop.exec( QEventLoop::ExcludeUserInputEvents ); +#ifdef WITH_QTWEBKIT //inject JSON feature if ( !mAtlasFeatureJSON.isEmpty() ) { @@ -251,6 +252,7 @@ void QgsLayoutItemHtml::loadHtml( const bool useCache, const QgsExpressionContex jsLoop.execIfNotDone(); } +#endif recalculateFrameSizes(); //trigger a repaint