Skip to content

Commit

Permalink
debian packaging update: include links to qt4 in api docs
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jun 2, 2015
1 parent a07069c commit 43a8d72
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
3 changes: 2 additions & 1 deletion debian/changelog
Expand Up @@ -5,8 +5,9 @@ qgis (2.9.0) UNRELEASED; urgency=medium
* 'stretch' package a bit
* merge downstream addition of debug package
* make build directory configurable
* include links to qt4 documentation in api docs

-- Jürgen E. Fischer <jef@norbit.de> Thu, 28 May 2015 00:35:42 +0200
-- Jürgen E. Fischer <jef@norbit.de> Tue, 02 Jun 2015 22:54:19 +0200

qgis (2.8.0) unstable; urgency=medium

Expand Down
4 changes: 3 additions & 1 deletion debian/control.in
Expand Up @@ -50,7 +50,7 @@ Build-Depends:
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
#sid-oracle# oracle-instantclient11.2-devel,
spawn-fcgi, lighttpd, poppler-utils, locales
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html
Build-Conflicts: libqgis-dev, qgis-dev
#sid stretch jessie sid-oracle vivid#Standards-Version: 3.9.6
#wheezy#Standards-Version: 3.9.3
Expand Down Expand Up @@ -417,6 +417,8 @@ Section: doc
Depends:
libjs-jquery,
${misc:Depends}
Recommends:
qt4-doc-html
Description: QGIS API documentation
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
Expand Down
4 changes: 3 additions & 1 deletion debian/rules
Expand Up @@ -65,7 +65,9 @@ CMAKE_OPTS := \
-DWITH_INTERNAL_PYGMENTS=FALSE \
-DWITH_INTERNAL_DATEUTIL=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE \
-DWITH_INTERNAL_SIX=FALSE
-DWITH_INTERNAL_SIX=FALSE \
-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
-DQT_DOC_URL=/usr/share/qt4/doc/html/

ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/qgsgeometryutils.h
Expand Up @@ -98,7 +98,7 @@ class CORE_EXPORT QgsGeometryUtils

/** Parses a WKT string and returns of list of blocks contained in the WKT.
* @param wkt WKT string in the format "TYPE1 (contents1), TYPE2 (TYPE3 (contents3), TYPE4 (contents4))"
* @param defaultTYpe
* @param defaultType default geometry type for childen
* @returns list of WKT child block strings, eg List("TYPE1 (contents1)", "TYPE2 (TYPE3 (contents3), TYPE4 (contents4))")
*/
static QStringList wktGetChildBlocks( const QString& wkt , const QString &defaultType = "" );
Expand Down

1 comment on commit 43a8d72

@nyalldawson
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jef-n thanks!!

Please sign in to comment.