[qgis] 06/06: Re-enable QtWebKit support using embedded copy.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit 168aed2b92c3e7eca8cd43a44ee788f14323875c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 24 09:16:38 2016 +0200

    Re-enable QtWebKit support using embedded copy.
---
 debian/changelog | 1 +
 debian/control   | 1 +
 debian/rules     | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e827da9..9aadcda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qgis (2.14.7+dfsg-1) UNRELEASED; urgency=medium
   * Update copyright file, changes:
     - Add license & copyright for QtWebKit files.
   * Install PyQt4 files in python-qgis package.
+  * Re-enable QtWebKit support using embedded copy.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 24 Sep 2016 08:49:21 +0200
 
diff --git a/debian/control b/debian/control
index 919a266..510a728 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Build-Depends: bison,
                libqca2-dev,
                libqca2-plugin-ossl,
                libqscintilla2-dev,
+               libqtwebkit-dev,
                libqwt-dev,
                libspatialite-dev,
                libsqlite3-dev,
diff --git a/debian/rules b/debian/rules
index f441e8e..6d46577 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,6 @@ CMAKE_OPTS := \
 	-DWITH_INTERNAL_DATEUTIL=FALSE \
 	-DWITH_INTERNAL_PYTZ=FALSE \
 	-DWITH_INTERNAL_YAML=FALSE \
-	-DWITH_QTWEBKIT=FALSE \
 	-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
 	-DQT_DOC_URL=/usr/share/qt4/doc/html/
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git