diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04f4b424b85..b6bf520149b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,9 +238,12 @@ IF (POSTGRES_FOUND)
SET (HAVE_POSTGRESQL TRUE)
ENDIF (POSTGRES_FOUND)
-SET (WITH_QTWEBKIT TRUE CACHE INTERNAL "Enable QtWebkit support")
+SET (WITH_QTWEBKIT TRUE CACHE BOOL "Enable QtWebkit support")
IF (WITH_QTWEBKIT)
ADD_DEFINITIONS(-DWITH_QTWEBKIT)
+ MESSAGE(STATUS "Qt WebKit support enabled")
+ELSE (WITH_QTWEBKIT)
+ MESSAGE(STATUS "Qt WebKit support DISABLED.")
ENDIF(WITH_QTWEBKIT)
#############################################################
# search for Qt4
diff --git a/debian/control.in b/debian/control.in
index ed57cba6ea6..b2095c6b864 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -28,7 +28,7 @@ Build-Depends:
libqt4-opengl-dev,
libqca2-dev,
libqca2-plugin-ossl,
- libqtwebkit-dev,
+#wheezy jessie precise trusty utopic vivid wily# libqtwebkit-dev,
#stretch jessie wheezy# libqwt-dev,
#precise trusty wily xenial sid# libqwt5-qt4-dev,
libspatialite-dev,
diff --git a/debian/rules b/debian/rules
index a64c252f90b..21e7fb4dfb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,7 +117,9 @@ ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
endif
ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
- CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
+ CMAKE_OPTS += \
+ -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so \
+ -DWITH_QTWEBKIT=FALSE
endif
ifneq (,$(findstring $(DISTRIBUTION),"sid"))
diff --git a/python/plugins/processing/modeler/ModelerParametersDialog.py b/python/plugins/processing/modeler/ModelerParametersDialog.py
index e5a9d3fd4e5..a240ebb0664 100644
--- a/python/plugins/processing/modeler/ModelerParametersDialog.py
+++ b/python/plugins/processing/modeler/ModelerParametersDialog.py
@@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'
from qgis.PyQt.QtCore import Qt, QUrl, QMetaObject
from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox, QLabel, QLineEdit, QFrame, QPushButton, QSizePolicy, QVBoxLayout, QHBoxLayout, QTabWidget, QWidget, QScrollArea, QComboBox, QTableWidgetItem, QMessageBox
-from qgis.PyQt.QtWebKitWidgets import QWebView
+from qgis.core import QgsWebView
from processing.gui.CrsSelectionPanel import CrsSelectionPanel
from processing.gui.MultipleInputPanel import MultipleInputPanel
@@ -194,7 +194,7 @@ class ModelerParametersDialog(QDialog):
self.scrollArea.setWidget(self.paramPanel)
self.scrollArea.setWidgetResizable(True)
self.tabWidget.addTab(self.scrollArea, self.tr('Parameters'))
- self.webView = QWebView()
+ self.webView = QgsWebView()
html = None
url = None
diff --git a/python/plugins/processing/ui/DlgAlgorithmBase.ui b/python/plugins/processing/ui/DlgAlgorithmBase.ui
index e76058e5a2b..b171a2f863b 100644
--- a/python/plugins/processing/ui/DlgAlgorithmBase.ui
+++ b/python/plugins/processing/ui/DlgAlgorithmBase.ui
@@ -69,7 +69,7 @@
0
-
-
+
about:blank
@@ -133,9 +133,9 @@
- QWebView
+ QgsWebView
QWidget
-
+
diff --git a/python/plugins/processing/ui/DlgGetScriptsAndModels.ui b/python/plugins/processing/ui/DlgGetScriptsAndModels.ui
index 735a0ce3ad2..72378dc329b 100644
--- a/python/plugins/processing/ui/DlgGetScriptsAndModels.ui
+++ b/python/plugins/processing/ui/DlgGetScriptsAndModels.ui
@@ -74,7 +74,7 @@
0
-
-
+
10000
@@ -144,9 +144,9 @@
- QWebView
+ QgsWebView
QWidget
-
+
diff --git a/python/plugins/processing/ui/DlgHelpEdition.ui b/python/plugins/processing/ui/DlgHelpEdition.ui
index 3f0665388af..739c4986f06 100644
--- a/python/plugins/processing/ui/DlgHelpEdition.ui
+++ b/python/plugins/processing/ui/DlgHelpEdition.ui
@@ -25,7 +25,7 @@
Qt::Vertical
-
+
about:blank
@@ -112,9 +112,9 @@
- QWebView
+ QgsWebView
QWidget
-
+
diff --git a/python/plugins/processing/ui/DlgResults.ui b/python/plugins/processing/ui/DlgResults.ui
index aef1ad2e9fe..eb4656737cb 100644
--- a/python/plugins/processing/ui/DlgResults.ui
+++ b/python/plugins/processing/ui/DlgResults.ui
@@ -41,7 +41,7 @@
-
+
0
@@ -70,9 +70,9 @@
- QWebView
+ QgsWebView
QWidget
-
+