This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit 94ae262a5de255774ac5fb2256461933ace6e2eb Author: Bas Couwenberg <[email protected]> Date: Fri Aug 18 19:55:01 2017 +0200 New upstream version 2.14.18+dfsg --- CMakeLists.txt | 2 +- ChangeLog | 14 ++++++++++++++ debian/changelog | 10 ++++++++-- src/customwidgets/CMakeLists.txt | 1 + src/server/qgswmsserver.cpp | 5 ++--- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c199bae..2733a16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "2") SET(CPACK_PACKAGE_VERSION_MINOR "14") -SET(CPACK_PACKAGE_VERSION_PATCH "17") +SET(CPACK_PACKAGE_VERSION_PATCH "18") SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) SET(RELEASE_NAME "Essen") IF (POLICY CMP0048) # in CMake 3.0.0+ diff --git a/ChangeLog b/ChangeLog index 0741c33..6b6bb71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Larry Shaffer <[email protected]> 2017-08-14 + + Add QSCINTILLA_INCLUDE_DIR to custom widgets CMake setup + +rldhont <[email protected]> 2017-07-26 + + [BUGFIX][SERVER] GetFeatureInfo not evaluated for maptip context when using FILTER param + + fixed #16670 + +Juergen E. Fischer <[email protected]> 2017-07-21 + + Release of 2.14.17 + Even Rouault <[email protected]> 2017-07-08 [OGR] Use OGR_F_SetFieldNull() with GDAL >= 2.2 to avoid GeoJSON fields to be unset (fixes #16812) diff --git a/debian/changelog b/debian/changelog index 57fbf42..675e710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -qgis (2.14.17) UNRELEASED; urgency=medium +qgis (2.14.18) UNRELEASED; urgency=medium + + * Release of 2.14.18 + + -- Jürgen E. Fischer <[email protected]> Fri, 18 Aug 2017 14:31:42 +0200 + +qgis (2.14.17) unstable; urgency=medium * Release of 2.14.17 - -- Jürgen E. Fischer <[email protected]> Fri, 21 Jul 2017 14:00:03 +0200 + -- Jürgen E. Fischer <[email protected]> Fri, 18 Aug 2017 14:31:42 +0200 qgis (2.14.16) unstable; urgency=medium diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt index c914eb1..3f3c915 100644 --- a/src/customwidgets/CMakeLists.txt +++ b/src/customwidgets/CMakeLists.txt @@ -116,6 +116,7 @@ INCLUDE_DIRECTORIES( ) INCLUDE_DIRECTORIES(SYSTEM ${GEOS_INCLUDE_DIR} + ${QSCINTILLA_INCLUDE_DIR} ${Qt5UiPlugin_INCLUDE_DIRS} # For Qt5 ${Qt5Designer_INCLUDE_DIRS} # For Qt5 ${QT_QTDESIGNER_INCLUDE_DIR} # For Qt4 diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp index 9b52084..1520e25 100644 --- a/src/server/qgswmsserver.cpp +++ b/src/server/qgswmsserver.cpp @@ -2363,6 +2363,8 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer, break; } + renderContext.expressionContext().setFeature( feature ); + if ( layer->wkbType() != QGis::WKBNoGeometry && ! searchRect.isEmpty() ) { if ( !r2 ) @@ -2370,9 +2372,6 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer, continue; } - renderContext.expressionContext().setFeature( feature ); - - //check if feature is rendered at all bool render = r2->willRenderFeature( feature, renderContext ); if ( !render ) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
