Merge pull request #9765 from elpaso/fix-webkit-build

elpaso · web-flow · commit 2e613b47d256 · 2019-04-10T11:10:56.000+02:00
Fix build without webkit
diff --git a/src/gui/editorwidgets/qgshtmlwidgetwrapper.cpp b/src/gui/editorwidgets/qgshtmlwidgetwrapper.cpp
@@ -18,9 +18,9 @@
 #include "qgsmessagelog.h"
 #include "qgsexpressioncontextutils.h"
 #include "qgsapplication.h"
-
 #include "qgswebframe.h"
 
+
 QgsHtmlWidgetWrapper::QgsHtmlWidgetWrapper( QgsVectorLayer *layer, QWidget *editor, QWidget *parent )
   : QgsWidgetWrapper( layer, editor, parent )
 {
@@ -45,6 +45,7 @@ void QgsHtmlWidgetWrapper::initWidget( QWidget *editor )
     return;
 
   mWidget->setHtml( mHtmlCode );
+#ifdef WITH_QTWEBKIT
   const int horizontalDpi = qApp->desktop()->screen()->logicalDpiX();
   mWidget->setZoomFactor( horizontalDpi / 96.0 );
 
@@ -54,6 +55,7 @@ void QgsHtmlWidgetWrapper::initWidget( QWidget *editor )
     auto docHeight { page->mainFrame()->contentsSize().height() };
     mWidget->setFixedHeight( docHeight );
   }, Qt::ConnectionType::UniqueConnection );
+#endif
 
 }
 
