gentoo resync : 25.08.2018

1 files changed, 30 insertions, 0 deletions

diff --git a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch b/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch
new file mode 100644
index 000000000000..9e56bf5ae959
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch
@@ -0,0 +1,30 @@
+From 55473e7e21a068dec904fd4146642c33a44ce22a Mon Sep 17 00:00:00 2001
+From: Denis Rouzaud <denis.rouzaud@gmail.com>
+Date: Wed, 8 Aug 2018 13:40:04 +0200
+Subject: [PATCH] fix build without webkit
+
+---
+ src/gui/qgsmaptip.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp
+index d9fe4a32607..7af6f97672c 100644
+--- a/src/gui/qgsmaptip.cpp
++++ b/src/gui/qgsmaptip.cpp
+@@ -155,12 +155,16 @@ void QgsMapTip::showMapTip( QgsMapLayer *pLayer,
+ 
+ void QgsMapTip::resizeContent()
+ {
++#if WITH_QTWEBKIT
+   // Get the content size
+   QWebElement container = mWebView->page()->mainFrame()->findFirstElement(
+                             QStringLiteral( "#QgsWebViewContainer" ) );
+   int width = container.geometry().width() + MARGIN_VALUE * 2;
+   int height = container.geometry().height() + MARGIN_VALUE * 2;
+   mWidget->resize( width, height );
++#else
++  mWebView->adjustSize();
++#endif
+ }
+ 
+ void QgsMapTip::clear( QgsMapCanvas * )
\ No newline at end of file