Skip to content

Commit 18b9242

Browse files
committed
Merged master fixed conflict.
2 parents f8d7061 + 3e2b4fc commit 18b9242

836 files changed

Lines changed: 25627 additions & 7011 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ matrix:
2323
- llvm-toolchain-precise-3.8
2424
- ubuntu-toolchain-r-test
2525
- george-edison55-precise-backports # doxygen 1.8.3
26-
# - laurent-boulard-devtools not whitelisted yet https://github.com/travis-ci/apt-source-whitelist/pull/345
26+
# - laurent-boulard-devtools (for silver-search, not whitelisted yet https://github.com/travis-ci/apt-source-whitelist/pull/345)
2727
packages:
2828
- doxygen
2929
- bison
@@ -33,6 +33,7 @@ matrix:
3333
- libfcgi-dev
3434
- libfftw3-3
3535
- pkg-config
36+
- perl # lookahead regex in spell check script
3637
- poppler-utils
3738
- txt2tags
3839
- xvfb

‎CMakeLists.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,8 @@ IF (WIN32)
445445
SET (DEFAULT_PLUGIN_SUBDIR plugins)
446446
SET (DEFAULT_INCLUDE_SUBDIR include)
447447

448+
SET (DEFAULT_SERVER_MODULE_SUBDIR server)
449+
448450
IF (MSVC)
449451
SET (DEFAULT_BIN_SUBDIR bin)
450452
SET (DEFAULT_CGIBIN_SUBDIR bin)
@@ -518,6 +520,10 @@ ELSE (WIN32)
518520
SET (DEFAULT_PLUGIN_SUBDIR ../PlugIns/qgis)
519521
SET (QGIS_PLUGIN_SUBDIR_REV ../../MacOS)
520522
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
523+
524+
# Set server moodules path to DEFAULT_LIBEXEC_SUBDIR+'/server'
525+
SET (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
526+
521527
# path for framework references when running from build directory
522528
# changed later to reference in-app resources upon install
523529
SET (CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib)
@@ -541,6 +547,8 @@ ELSE (WIN32)
541547
SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
542548
SET (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins)
543549
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
550+
551+
SET (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
544552
ENDIF (APPLE)
545553

546554
ENDIF (WIN32)
@@ -587,6 +595,8 @@ SET (QGIS_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING "Subdirectory wh
587595
SET (QGIS_PLUGIN_SUBDIR ${DEFAULT_PLUGIN_SUBDIR} CACHE STRING "Subdirectory where plugins will be installed")
588596
SET (QGIS_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING "Subdirectory where header files will be installed")
589597

598+
SET (QGIS_SERVER_MODULE_SUBDIR ${DEFAULT_SERVER_MODULE_SUBDIR} CACHE STRING "Subdirectory where server modules will be installed")
599+
590600
# mark *_SUBDIR variables as advanced as this is not something
591601
# that an average user would use
592602
MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_CGIBIN_SUBDIR QGIS_LIB_SUBDIR QGIS_LIBEXEC_SUBDIR QGIS_DATA_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
@@ -600,6 +610,8 @@ SET (QGIS_DATA_DIR ${QGIS_DATA_SUBDIR})
600610
SET (QGIS_PLUGIN_DIR ${QGIS_PLUGIN_SUBDIR})
601611
SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})
602612

613+
SET (QGIS_SERVER_MODULE_DIR ${QGIS_SERVER_MODULE_SUBDIR})
614+
603615
# set the default locations where the targets (executables, libraries) will land when compiled
604616
# this is to allow running qgis from the source tree without having to actually do a "make install"
605617
SET (QGIS_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output)

‎NEWS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ This release has following new features:
9191
- Layer Legend: New option to zoom to a layer's visible scale range
9292
- Map Composer: New tools for drawing polygons and polylines
9393
- Map Composer: Embed atlas features into composer HTML source as GeoJSON
94-
- Map Composer: Parameterized svg support for composer svg images
94+
- Map Composer: Parametrized svg support for composer svg images
9595
- Map Composer: Easier use of HTML in labels
9696
- Map Composer: Relative links in composer labels
9797
- Map Composer: Georeference outputs (eg PDF) from composer

‎cmake_templates/qgsconfig.h.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
2929
#define CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}"
3030

31+
#define QGIS_SERVER_MODULE_SUBDIR "${QGIS_SERVER_MODULE_SUBDIR}"
32+
3133
#define QSCINTILLA_VERSION_STR "${QSCINTILLA_VERSION_STR}"
3234

3335
#if defined( __APPLE__ )

‎doc/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
2222
)
2323
ENDIF(TXT2TAGS_EXECUTABLE)
2424

25-
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html contributors.json favicon.ico style.css release-sponsors.html AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)
25+
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html nohelp.html contributors.json favicon.ico style.css release-sponsors.html AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)
2626

2727
INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
2828
INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/doc/images)
@@ -58,6 +58,7 @@ IF(WITH_APIDOC)
5858
${CMAKE_SOURCE_DIR}/src/core/gps
5959
${CMAKE_SOURCE_DIR}/src/core/layertree
6060
${CMAKE_SOURCE_DIR}/src/core/pal
61+
${CMAKE_SOURCE_DIR}/src/core/processing
6162
${CMAKE_SOURCE_DIR}/src/core/raster
6263
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
6364
${CMAKE_SOURCE_DIR}/src/gui

‎doc/api_break.dox‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
205205
<tr><td>QgsApplication<td>userStyleV2Path<td>userStylePath
206206
<tr><td>QgsComposerShape<td>setUseSymbolV2<td>setUseSymbol
207207
<tr><td>QgsIFeatureSelectionManager<td>selectedFeaturesIds<td>selectedFeatureIds
208-
<tr><td>QgsMapLayer<td>capitaliseLayerName<td>capitalizeLayerName
208+
<tr><td>QgsMapLayer<td>capitaliseLayerName<td>capitalizeLayerName <!--#spellok-->
209209
<tr><td>QgsSymbolLayerUtils<td>createSymbolLayerV2ListFromSld<td>createSymbolLayerListFromSld
210210
<tr><td>QgsVectorLayer<td>editorWidgetV2Config<td>editorWidgetConfig
211211
<tr><td>QgsVectorLayer<td>editorWidgetV2Text<td>editorWidgetText
@@ -582,6 +582,7 @@ QgsComposerNodesItem {#qgis_api_break_3_0_QgsComposerNodesItem}
582582

583583
- _readXMLStyle() has been renamed to _readXmlStyle()
584584
- _writeXMLStyle() has been renamed to _writeXMLStyle()
585+
- unselectNode() has been renamed to deselectNode() <!--#spellok-->
585586

586587

587588
QgsComposerPicture {#qgis_api_break_3_0_QgsComposerPicture}
@@ -610,6 +611,11 @@ QgsComposerTableV2 {#qgis_api_break_3_0_QgsComposerTableV2}
610611

611612
- rowsVisible(), rowRange(), drawHorizontalGridLines() and
612613
drawVerticalGridLines() were removed.
614+
615+
QgsComposerView {#qgis_api_break_3_0_QgsComposerView}
616+
--------------------
617+
618+
- unselectNode() has been renamed to deselectNode() <!--#spellok-->
613619

614620

615621
QgsComposition {#qgis_api_break_3_0_QgsComposition}
@@ -625,6 +631,7 @@ were removed. Use setSnapTolerance() and snapTolerance() instead.
625631
- pixelFontSize(), pointFontSize(), relativeResizeRect(), relativePosition() were removed. Use the corresponding methods in QgsComposerUtils instead.
626632
- sortZList() was removed. Use refreshZList() instead.
627633
- addComposerTable(), composerTableAdded() were removed.
634+
- setAllUnselected() has been renamed to setAllDeselected. <!--#spellok-->
628635

629636

630637
QgsCoordinateReferenceSystem {#qgis_api_break_3_0_QgsCoordinateReferenceSystem}
@@ -1189,7 +1196,7 @@ screenUpdateRequested() were removed. These members have had no effect for a num
11891196
- drawLabels() method was removed. It used old deprecated labeling. Replaced by labeling based on PAL library, see QgsLabelingEngine.
11901197
- readLayerXML() was renamed to readLayerXml()
11911198
- writeLayerXML() was renamed to writeLayerXml()
1192-
- capitaliseLayerName() was renamed to capitalizeLayerName()
1199+
- capitaliseLayerName() was renamed to capitalizeLayerName() <!--#spellok-->
11931200

11941201

11951202
QgsMapLayerRegistry {#qgis_api_break_3_0_QgsMapLayerRegistry}
@@ -1819,7 +1826,16 @@ optional property map passing down layer level properties to the SLD encoders. I
18191826
- setScaleMethodToSymbol was removed. This is now handled using data defined scaling at a symbol layer level
18201827
- usedAttributes is now a const method and returns QSet<QString> instead of QStringList
18211828

1829+
Processing {#qgis_api_break_3_0_Processing}
1830+
----------
18221831

1832+
- Algorithm providers now subclass the c++ QgsProcessingProvider class, and must be adapted to the API for QgsProcessingProvider. Specifically,
1833+
getName() should be replaced with id(), getDescription() with name(), and getIcon with icon().
1834+
- Algorithm's processAlgorithm method now passes a QgsProcessingFeedback object instead of the loosely defined progress parameter. Algorithms will
1835+
need to update their use of the progress argument to utilise the QgsProcessingFeedback API.
1836+
- Similarly, Python processing scripts no longer have access to a progress variable for reporting their progress. Instead they have a feedback
1837+
object of type QgsProcessingFeedback, and will need to adapt their use of progress reporting to the QgsProcessingFeedback API.
1838+
- SilentProgress was removed. Use the base QgsProcessingFeedback class instead.
18231839

18241840

18251841
QGIS 2.4 {#qgis_api_break_2_4}

‎doc/news.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ <H1>1. What's new in Version 2.16 'Nødebo'?</H1>
171171
<LI>Layer Legend: New option to zoom to a layer's visible scale range
172172
<LI>Map Composer: New tools for drawing polygons and polylines
173173
<LI>Map Composer: Embed atlas features into composer HTML source as GeoJSON
174-
<LI>Map Composer: Parameterized svg support for composer svg images
174+
<LI>Map Composer: Parametrized svg support for composer svg images
175175
<LI>Map Composer: Easier use of HTML in labels
176176
<LI>Map Composer: Relative links in composer labels
177177
<LI>Map Composer: Georeference outputs (e.g., PDF) from composer

‎doc/news.t2t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ This release has following new features:
8585
- Layer Legend: New option to zoom to a layer's visible scale range
8686
- Map Composer: New tools for drawing polygons and polylines
8787
- Map Composer: Embed atlas features into composer HTML source as GeoJSON
88-
- Map Composer: Parameterized svg support for composer svg images
88+
- Map Composer: Parametrized svg support for composer svg images
8989
- Map Composer: Easier use of HTML in labels
9090
- Map Composer: Relative links in composer labels
9191
- Map Composer: Georeference outputs (eg PDF) from composer

‎doc/nohelp.html‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>No help found</title>
5+
<meta charset="UTF-8">
6+
</head>
7+
<body>
8+
<center><a href="http://qgis.org"><img src="qgis-icon-60x60.png" border=0></a></center>
9+
<h1><center>Oops!</center></h1>
10+
<p>QGIS help is currently not available. This is likely because:</p>
11+
<ul>
12+
<li>No internet connection is available</li>
13+
<li>The offline help files are not available or the location of these
14+
files is not properly configured</li>
15+
<li>No help content is available for the requested topic</li>
16+
</ul>
17+
<p>Please check that the correct location of the offline help files is
18+
specified in the QGIS options dialog (Settings&nbsp;&rarr; Options&nbsp;&rarr;System).</p>
19+
</body>
20+
</html>

‎doc/release-sponsors.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ <h3 class="text-muted"><img src="images/projects/thumbnails/0e2f6fb1efc89d41120c
121121
<p>April 17, 2016 - April 17, 2017</p>
122122
<p>Bronze : 500 EUR or more</p>
123123
<p><img src="images/projects/thumbnails/e24951be1e5ff2d6fd591f9760871e38a684bed0.png.100x50_q85.png" /></p>
124-
<p><a href="http://www.gfi-gis.de/">GFI - Gesellschaft für Informationstechnologie mbH</a></p>
124+
<p><a href="http://www.gfi-gis.de/">GFI - Gesellschaft für Informationstechnologie mbH</a></p> <!--#spellok-->
125125
<p>April 15, 2016 - April 15, 2017</p>
126126
<p>Bronze : 500 EUR or more</p>
127127
<p><img src="images/projects/thumbnails/44113fc21a8e2cd84d93459d0f00b3a64850095c.png.100x50_q85.jpg" /></p>

0 commit comments

Comments
 (0)