sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

make webkit optional

Browse Source
This commit is contained in:
Juergen E. Fischer 2016-05-27 08:41:58 +02:00
parent ed1235d3bf
commit 38f6ace4c0
8 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -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

2
debian/control.in vendored
View File

@ -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,

4
debian/rules vendored
View File

@ -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"))

4
python/plugins/processing/modeler/ModelerParametersDialog.py
View File

@ -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

6
python/plugins/processing/ui/DlgAlgorithmBase.ui
View File

@ -69,7 +69,7 @@
<number>0</number>
</property>
<item>
<widget class="QWebView" name="textHelp">
<widget class="QgsWebView" name="textHelp">
<property name="url">
<url>
<string>about:blank</string>
@ -133,9 +133,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QWebView</class>
<class>QgsWebView</class>
<extends>QWidget</extends>
<header>QtWebKit/QWebView</header>
<header>qgis.core</header>
</customwidget>
</customwidgets>
<resources/>

6
python/plugins/processing/ui/DlgGetScriptsAndModels.ui
View File

@ -74,7 +74,7 @@
<number>0</number>
</property>
<item>
<widget class="QWebView" name="webView">
<widget class="QgsWebView" name="webView">
<property name="maximumSize">
<size>
<width>10000</width>
@ -144,9 +144,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QWebView</class>
<class>QgsWebView</class>
<extends>QWidget</extends>
<header>QtWebKit/QWebView</header>
<header>qgis.core</header>
</customwidget>
</customwidgets>
<resources/>

6
python/plugins/processing/ui/DlgHelpEdition.ui
View File

@ -25,7 +25,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QWebView" name="webView">
<widget class="QgsWebView" name="webView">
<property name="url">
<url>
<string>about:blank</string>
@ -112,9 +112,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QWebView</class>
<class>QgsWebView</class>
<extends>QWidget</extends>
<header>QtWebKit/QWebView</header>
<header>qgis.core</header>
</customwidget>
</customwidgets>
<resources/>

6
python/plugins/processing/ui/DlgResults.ui
View File

@ -41,7 +41,7 @@
</property>
</column>
</widget>
<widget class="QWebView" name="webView">
<widget class="QgsWebView" name="webView">
<property name="minimumSize">
<size>
<width>0</width>
@ -70,9 +70,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QWebView</class>
<class>QgsWebView</class>
<extends>QWidget</extends>
<header>QtWebKit/QWebView</header>
<header>qgis.core</header>
</customwidget>
</customwidgets>
<resources/>