Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/QGIS

  • Loading branch information
borysiasty committed Nov 1, 2017
2 parents 77de9fc + e9d2fd6 commit ac6c598f3232b34814d9f9803d8813202eb9c3dc
Showing with 3,201 additions and 4,243 deletions.
  1. +0 −1 .ci/travis/macos/install.sh
  2. +15 −11 CMakeLists.txt
  3. +30 −26 INSTALL
  4. +13 −12 doc/INSTALL.html
  5. +54 −8 doc/api_break.dox
  6. +6 −6 doc/linux.t2t
  7. +1 −1 doc/osx.t2t
  8. +1 −0 doc/overview.t2t
  9. +1 −1 images/themes/default/pin.svg
  10. +18 −11 python/analysis/network/qgsgraph.sip
  11. +2 −0 python/analysis/network/qgsgraphbuilder.sip
  12. +1 −11 python/analysis/network/qgsnetworkspeedstrategy.sip
  13. +4 −5 python/analysis/network/qgsnetworkstrategy.sip
  14. +8 −8 python/core/geometry/qgsabstractgeometry.sip
  15. +3 −3 python/core/geometry/qgscurvepolygon.sip
  16. +4 −4 python/core/geometry/qgsellipse.sip
  17. +37 −37 python/core/geometry/qgsgeometry.sip
  18. +5 −5 python/core/geometry/qgsmultipoint.sip
  19. +4 −4 python/core/geometry/qgsmultipolygon.sip
  20. +5 −5 python/core/geometry/qgspolygon.sip
  21. +2 −2 python/core/geometry/qgsregularpolygon.sip
  22. +2 −2 python/core/geometry/qgssurface.sip
  23. +2 −2 python/core/geometry/qgstriangle.sip
  24. +0 −96 python/core/symbology/qgssvgcache.sip
  25. +2 −2 python/core/symbology/qgssymbol.sip
  26. +0 −18 python/plugins/db_manager/README.md
  27. +1 −1 python/plugins/processing/algs/qgis/CheckValidity.py
  28. +1 −1 python/plugins/processing/algs/qgis/Delaunay.py
  29. +6 −6 python/plugins/processing/algs/qgis/GeometryConvert.py
  30. +3 −3 python/plugins/processing/algs/qgis/GridPolygon.py
  31. +1 −1 python/plugins/processing/algs/qgis/HubDistancePoints.py
  32. +4 −4 python/plugins/processing/algs/qgis/LinesToPolygons.py
  33. +2 −2 python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py
  34. +1 −1 python/plugins/processing/algs/qgis/PointsFromLines.py
  35. +1 −1 python/plugins/processing/algs/qgis/RandomPointsAlongLines.py
  36. +1 −1 python/plugins/processing/algs/qgis/RandomPointsExtent.py
  37. +1 −1 python/plugins/processing/algs/qgis/RandomPointsLayer.py
  38. +1 −1 python/plugins/processing/algs/qgis/RandomPointsPolygons.py
  39. +6 −6 python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py
  40. +6 −6 python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py
  41. +2 −2 python/plugins/processing/algs/qgis/RegularPoints.py
  42. +25 −14 python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py
  43. +9 −9 python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py
  44. +31 −22 python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py
  45. +32 −23 python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py
  46. +7 −9 python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py
  47. +1 −1 python/plugins/processing/algs/qgis/VoronoiPolygons.py
  48. +1 −1 python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py
  49. +37 −0 python/plugins/processing/tests/testdata/custom/route_points.gml
  50. +30 −0 python/plugins/processing/tests/testdata/custom/route_points.xsd
  51. +2 −2 python/plugins/processing/tests/testdata/expected/service_area.gml
  52. BIN python/plugins/processing/tests/testdata/expected/service_area_from_layer.dbf
  53. +1 −0 python/plugins/processing/tests/testdata/expected/service_area_from_layer.prj
  54. +1 −0 python/plugins/processing/tests/testdata/expected/service_area_from_layer.qpj
  55. BIN python/plugins/processing/tests/testdata/expected/service_area_from_layer.shp
  56. BIN python/plugins/processing/tests/testdata/expected/service_area_from_layer.shx
  57. BIN python/plugins/processing/tests/testdata/expected/shortest_path_layer_to_point.dbf
  58. +50 −0 python/plugins/processing/tests/testdata/expected/shortest_path_layer_to_point.gml
  59. +1 −0 python/plugins/processing/tests/testdata/expected/shortest_path_layer_to_point.prj
  60. +1 −0 python/plugins/processing/tests/testdata/expected/shortest_path_layer_to_point.qpj
  61. BIN python/plugins/processing/tests/testdata/expected/shortest_path_layer_to_point.shp
  62. BIN python/plugins/processing/tests/testdata/expected/shortest_path_layer_to_point.shx
  63. +52 −0 python/plugins/processing/tests/testdata/expected/shortest_path_layer_to_point.xsd
  64. BIN python/plugins/processing/tests/testdata/expected/shortest_path_point_to_layer.dbf
  65. +1 −0 python/plugins/processing/tests/testdata/expected/shortest_path_point_to_layer.prj
  66. +1 −0 python/plugins/processing/tests/testdata/expected/shortest_path_point_to_layer.qpj
  67. BIN python/plugins/processing/tests/testdata/expected/shortest_path_point_to_layer.shp
  68. BIN python/plugins/processing/tests/testdata/expected/shortest_path_point_to_layer.shx
  69. +110 −4 python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
  70. +2 −0 python/utils.py
  71. +1 −1 scripts/addcopyright.sh
  72. +12 −4 scripts/astyle.sh
  73. +1 −0 scripts/scandeps.pl
  74. +1 −0 scripts/spell_check/spelling.dat
  75. +1 −1 scripts/update-indent.sh
  76. +1 −1 src/3d/qgs3dutils.cpp
  77. +2 −2 src/3d/qgs3dutils.h
  78. +2 −2 src/3d/qgstessellatedpolygongeometry.cpp
  79. +2 −2 src/3d/qgstessellatedpolygongeometry.h
  80. +2 −2 src/3d/qgstessellator.cpp
  81. +2 −2 src/3d/qgstessellator.h
  82. +4 −4 src/3d/symbols/qgsline3dsymbol_p.cpp
  83. +5 −5 src/3d/symbols/qgspolygon3dsymbol_p.cpp
  84. +1 −0 src/analysis/CMakeLists.txt
  85. +13 −13 src/analysis/network/qgsgraph.cpp
  86. +22 −15 src/analysis/network/qgsgraph.h
  87. +8 −9 src/analysis/network/qgsgraphanalyzer.cpp
  88. +2 −2 src/analysis/network/qgsgraphbuilder.h
  89. +3 −3 src/analysis/network/qgsnetworkspeedstrategy.cpp
  90. +1 −7 src/analysis/network/qgsnetworkspeedstrategy.h
  91. +3 −4 src/analysis/network/qgsnetworkstrategy.h
  92. +225 −217 src/analysis/network/qgsvectorlayerdirector.cpp
  93. +5 −2 src/analysis/network/qgsvectorlayerdirector.h
  94. +2 −2 src/analysis/processing/qgsalgorithmlineintersection.cpp
  95. +1 −1 src/analysis/processing/qgsalgorithmmeancoordinates.cpp
  96. +2 −2 src/analysis/raster/qgskde.cpp
  97. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
  98. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h
  99. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp
  100. +2 −2 src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.cpp
  101. +2 −2 src/analysis/vector/geometry_checker/qgsgeometrytypecheck.cpp
  102. +1 −1 src/app/composer/qgscomposerpicturewidget.cpp
  103. +3 −3 src/app/dwg/qgsdwgimporter.cpp
  104. +1 −2 src/app/main.cpp
  105. +1 −1 src/app/nodetool/qgsnodeeditor.cpp
  106. +2 −2 src/app/nodetool/qgsnodetool.cpp
  107. +0 −5 src/app/pluginmanager/qgspluginitemdelegate.cpp
  108. +0 −10 src/app/pluginmanager/qgspluginmanager.cpp
  109. +2 −3 src/app/pluginmanager/qgspluginsortfilterproxymodel.h
  110. +10 −5 src/app/qgisapp.cpp
  111. +9 −2 src/app/qgsattributetabledialog.cpp
  112. +5 −5 src/app/qgsmaptooladdfeature.cpp
  113. +2 −2 src/app/qgsmaptooladdrectangle.cpp
  114. +2 −2 src/app/qgsmaptooladdrectangle.h
  115. +1 −1 src/app/qgsmaptoolcircle2tangentspoint.cpp
  116. +6 −6 src/app/qgsmaptooldeletepart.cpp
  117. +8 −8 src/app/qgsmaptooldeletering.cpp
  118. +5 −5 src/app/qgsmaptoolfillring.cpp
  119. +1 −1 src/app/qgsmaptoollabel.cpp
  120. +1 −1 src/app/qgsmaptoolmovefeature.cpp
  121. +6 −6 src/app/qgsmaptooloffsetcurve.cpp
  122. +1 −1 src/app/qgsmaptoolrotatefeature.cpp
  123. +3 −3 src/app/qgsmaptoolselectutils.cpp
  124. +2 −2 src/app/qgsmaptoolsimplify.cpp
  125. +14 −14 src/app/qgsoptions.cpp
  126. +1 −1 src/core/composer/qgscomposermap.cpp
  127. +2 −2 src/core/expression/qgsexpressionfunction.cpp
  128. +9 −9 src/core/geometry/qgsabstractgeometry.h
  129. +1 −1 src/core/geometry/qgscurve.cpp
  130. +4 −4 src/core/geometry/qgscurvepolygon.cpp
  131. +3 −3 src/core/geometry/qgscurvepolygon.h
  132. +4 −4 src/core/geometry/qgsellipse.cpp
  133. +2 −2 src/core/geometry/qgsellipse.h
  134. +99 −99 src/core/geometry/qgsgeometry.cpp
  135. +40 −40 src/core/geometry/qgsgeometry.h
  136. +3 −3 src/core/geometry/qgsgeometrycollection.cpp
  137. +1 −1 src/core/geometry/qgsgeometryeditutils.cpp
  138. +20 −20 src/core/geometry/qgsgeometryfactory.cpp
  139. +14 −14 src/core/geometry/qgsgeometryfactory.h
  140. +5 −5 src/core/geometry/qgsgeometrymakevalid.cpp
  141. +6 −6 src/core/geometry/qgsgeos.cpp
  142. +2 −2 src/core/geometry/qgsgeos.h
  143. +12 −12 src/core/geometry/qgsinternalgeometryengine.cpp
  144. +1 −1 src/core/geometry/qgslinestring.h
  145. +1 −1 src/core/geometry/qgsmulticurve.cpp
  146. +18 −18 src/core/geometry/qgsmultipoint.cpp
  147. +8 −8 src/core/geometry/qgsmultipoint.h
  148. +24 −24 src/core/geometry/qgsmultipolygon.cpp
  149. +8 −8 src/core/geometry/qgsmultipolygon.h
  150. +3 −3 src/core/geometry/qgsmultisurface.cpp
  151. +15 −15 src/core/geometry/qgspolygon.cpp
  152. +9 −9 src/core/geometry/qgspolygon.h
  153. +1 −1 src/core/geometry/qgsrectangle.cpp
  154. +2 −2 src/core/geometry/qgsregularpolygon.cpp
  155. +1 −1 src/core/geometry/qgsregularpolygon.h
  156. +2 −2 src/core/geometry/qgssurface.h
  157. +1 −1 src/core/geometry/qgstriangle.cpp
  158. +2 −2 src/core/geometry/qgstriangle.h
  159. +2 −2 src/core/qgsdistancearea.cpp
  160. +1 −1 src/core/qgsexpressioncontext.cpp
  161. +3 −3 src/core/qgsgeometryvalidator.cpp
  162. +1 −1 src/core/qgsgeometryvalidator.h
  163. +2 −2 src/core/qgsmaptopixelgeometrysimplifier.cpp
  164. +9 −9 src/core/qgsogcutils.cpp
  165. +1 −1 src/core/qgspointlocator.cpp
  166. +4 −4 src/core/qgstracer.cpp
  167. +4 −4 src/core/qgsvectorlayereditutils.cpp
  168. +3 −3 src/core/qgsvectorlayerlabelprovider.cpp
  169. +1 −1 src/core/qgsvectorlayerrenderer.cpp
  170. +4 −6 src/core/symbology/qgsfillsymbollayer.cpp
  171. +4 −4 src/core/symbology/qgsheatmaprenderer.cpp
  172. +1 −1 src/core/symbology/qgsheatmaprenderer.h
  173. +6 −6 src/core/symbology/qgsinvertedpolygonrenderer.cpp
  174. +1 −1 src/core/symbology/qgsinvertedpolygonrenderer.h
  175. +4 −5 src/core/symbology/qgsmarkersymbollayer.cpp
  176. +1 −1 src/core/symbology/qgspointdistancerenderer.cpp
  177. +100 −61 src/core/symbology/qgssvgcache.cpp
  178. +41 −12 src/core/symbology/qgssvgcache.h
  179. +8 −5 src/core/symbology/qgssymbol.cpp
  180. +3 −3 src/core/symbology/qgssymbol.h
  181. +5 −5 src/core/symbology/qgssymbollayerutils.cpp
  182. +0 −2 src/gui/editorwidgets/qgsrelationreferencewidget.cpp
  183. +15 −12 src/gui/qgshighlight.cpp
  184. +1 −1 src/gui/qgshighlight.h
  185. +1 −1 src/gui/qgsmaptoolcapture.cpp
  186. +1 −0 src/gui/qgsmaptooledit.cpp
  187. +11 −11 src/gui/qgsrubberband.cpp
  188. +1 −1 src/gui/symbology/qgssvgselectorwidget.cpp
  189. +2 −2 src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp
  190. +12 −12 src/plugins/globe/featuresource/qgsglobefeatureutils.h
  191. +15 −15 src/plugins/topology/topolTest.cpp
  192. +2 −2 src/providers/arcgisrest/qgsarcgisrestutils.cpp
  193. +1 −1 src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
  194. +1 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  195. +6 −6 src/providers/grass/qgis.v.in.cpp
  196. +2 −2 src/providers/grass/qgsgrassgislib.cpp
  197. +2 −2 src/providers/grass/qgsgrassprovider.cpp
  198. +2 −2 src/providers/grass/qgsgrassvectormap.cpp
  199. +1 −1 src/providers/ogr/qgsogrfeatureiterator.cpp
  200. +0 −9 src/server/CMakeLists.txt
  201. +0 −91 src/server/qgsftptransaction.cpp
  202. +0 −46 src/server/qgsftptransaction.h
  203. +0 −89 src/server/qgshostedrdsbuilder.cpp
  204. +0 −34 src/server/qgshostedrdsbuilder.h
  205. +0 −94 src/server/qgshostedvdsbuilder.cpp
  206. +0 −33 src/server/qgshostedvdsbuilder.h
  207. +0 −575 src/server/qgshttptransaction.cpp
  208. +0 −230 src/server/qgshttptransaction.h
  209. +0 −149 src/server/qgsinterpolationlayerbuilder.cpp
  210. +0 −50 src/server/qgsinterpolationlayerbuilder.h
  211. +0 −91 src/server/qgsmslayerbuilder.cpp
  212. +0 −68 src/server/qgsmslayerbuilder.h
  213. +0 −157 src/server/qgsremotedatasourcebuilder.cpp
  214. +0 −47 src/server/qgsremotedatasourcebuilder.h
  215. +0 −308 src/server/qgsremoteowsbuilder.cpp
  216. +0 −50 src/server/qgsremoteowsbuilder.h
  217. +0 −132 src/server/qgssentdatasourcebuilder.cpp
  218. +0 −52 src/server/qgssentdatasourcebuilder.h
  219. +2 −2 tests/src/3d/testqgstessellator.cpp
  220. +2 −0 tests/src/analysis/CMakeLists.txt
  221. +468 −0 tests/src/analysis/testqgsnetworkanalysis.cpp
  222. +2 −2 tests/src/app/testqgsattributetable.cpp
  223. +2 −2 tests/src/app/testqgsfieldcalculator.cpp
  224. +4 −4 tests/src/app/testqgsmaptoolidentifyaction.cpp
  225. +3 −3 tests/src/app/testqgsnodetool.cpp
  226. +1 −0 tests/src/core/CMakeLists.txt
  227. +2 −2 tests/src/core/testqgscadutils.cpp
  228. +3 −3 tests/src/core/testqgsdistancearea.cpp
  229. +52 −52 tests/src/core/testqgsexpression.cpp
  230. +231 −231 tests/src/core/testqgsgeometry.cpp
  231. +5 −5 tests/src/core/testqgsgeometryutils.cpp
  232. +13 −13 tests/src/core/testqgsgml.cpp
  233. +2 −2 tests/src/core/testqgslabelingengine.cpp
  234. +7 −7 tests/src/core/testqgslegendrenderer.cpp
  235. +2 −2 tests/src/core/testqgsmaprendererjob.cpp
  236. +1 −1 tests/src/core/testqgsogcutils.cpp
  237. +5 −5 tests/src/core/testqgspointlocator.cpp
  238. +86 −5 tests/src/core/testqgsrenderers.cpp
  239. +2 −2 tests/src/core/testqgssnappingutils.cpp
  240. +3 −3 tests/src/core/testqgsspatialindex.cpp
  241. +259 −0 tests/src/core/testqgssvgcache.cpp
  242. +8 −8 tests/src/core/testqgsvectorfilewriter.cpp
  243. +4 −4 tests/src/python/offlineditingtestbase.py
  244. +3 −3 tests/src/python/test_provider_memory.py
  245. +3 −3 tests/src/python/test_qgsatlascomposition.py
  246. +2 −2 tests/src/python/test_qgsattributetablemodel.py
  247. +6 −6 tests/src/python/test_qgsdistancearea.py
  248. +1 −1 tests/src/python/test_qgseditwidgets.py
  249. +2 −2 tests/src/python/test_qgsfeature.py
  250. +8 −8 tests/src/python/test_qgsfeaturesink.py
  251. +5 −5 tests/src/python/test_qgsfeaturesource.py
  252. +92 −92 tests/src/python/test_qgsgeometry.py
  253. +1 −1 tests/src/python/test_qgsgraduatedsymbolrenderer.py
  254. +1 −1 tests/src/python/test_qgsmapcanvasannotationitem.py
  255. +1 −1 tests/src/python/test_qgsmaprenderer.py
  256. +1 −1 tests/src/python/test_qgsrangewidgets.py
  257. +6 −6 tests/src/python/test_qgsrelation.py
  258. +2 −2 tests/src/python/test_qgsrenderer.py
  259. +7 −7 tests/src/python/test_qgsserver_wfst.py
  260. +1 −1 tests/src/python/test_qgsspatialindex.py
  261. +29 −4 tests/src/python/test_qgssymbol.py
  262. +2 −2 tests/src/python/test_qgssymbollayer_readsld.py
  263. +48 −32 tests/src/python/test_qgstaskmanager.py
  264. +3 −3 tests/src/python/test_qgsvectorfilewriter.py
  265. +1 −1 tests/src/python/test_qgsvectorfilewritertask.py
  266. +36 −36 tests/src/python/test_qgsvectorlayer.py
  267. +16 −16 tests/src/python/test_qgsvectorlayereditbuffer.py
  268. +1 −1 tests/src/python/test_qgsvectorlayerutils.py
  269. BIN tests/testdata/control_images/expected_svgcache_changed_after/expected_svgcache_changed_after.png
  270. BIN .../testdata/control_images/expected_svgcache_changed_after/expected_svgcache_changed_after_mask.png
  271. BIN tests/testdata/control_images/expected_svgcache_changed_before/expected_svgcache_changed_before.png
  272. BIN tests/testdata/control_images/map_renderer/expected_emptygeometry/expected_emptygeometry.png
  273. BIN tests/testdata/control_images/symbol/expected_empty/expected_empty.png
  274. +76 −0 tests/testdata/test_symbol_svg2.svg
@@ -58,7 +58,6 @@ cmake \
-DENABLE_MODELTEST=ON \
-DENABLE_PGTEST=OFF \
-DWITH_QWTPOLAR=OFF \
-DWITH_PYSPATIALITE=ON \
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \
..

@@ -735,18 +735,22 @@ ENDIF (WITH_CORE)

####################################################
# clang-tidy
SET (WITH_CLANG_TIDY FALSE CACHE BOOL "Use Clang tidy")
MARK_AS_ADVANCED(WITH_CORE)
IF (WITH_CORE)
FIND_PROGRAM(
CLANG_TIDY_EXE
NAMES "clang-tidy"
DOC "Path to clang-tidy executable"
)
IF(NOT CLANG_TIDY_EXE)
MESSAGE(STATUS "clang-tidy not found.")
ELSE(NOT CLANG_TIDY_EXE)
MESSAGE(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
SET(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks=*,-clang-analyzer-alpha.*,-cppcoreguidelines*,-readability-implicit-bool-cast,-llvm-include-order,-cert-err58-cpp,-modernize-pass-by-value,-google-readability-braces-around-statements,-modernize-use-auto,-modernize-loop-convert,-readability-else-after-return,-readability-braces-around-statements,-google-runtime-references,-readability-named-parameter,-google-default-arguments,-google-readability-todo,-readability-inconsistent-declaration-parameter-name,-cert-flp30-c,-google-readability-casting,-clang-analyzer-security.FloatLoopCounter,-google-runtime-int,-modernize-use-using,-google-explicit-constructor,-google-build-using-namespace,-cert-err34-c,-clang-analyzer-core.CallAndMessage,-google-readability-function-size,-modernize-make-shared,-modernize-use-nullptr,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-core.NonNullParamChecker,performance-unnecessary-copy-initialization,-readability-simplify-boolean-expr,-modernize-raw-string-literal,-performance-unnecessary-copy-initialization")
ENDIF(NOT CLANG_TIDY_EXE)
IF(WITH_CLANG_TIDY)
FIND_PROGRAM(
CLANG_TIDY_EXE
NAMES "clang-tidy"
DOC "Path to clang-tidy executable"
)
IF(NOT CLANG_TIDY_EXE)
MESSAGE(STATUS "clang-tidy not found.")
ELSE(NOT CLANG_TIDY_EXE)
MESSAGE(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
SET(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks=*,-clang-analyzer-alpha.*,-cppcoreguidelines*,-readability-implicit-bool-cast,-llvm-include-order,-cert-err58-cpp,-modernize-pass-by-value,-google-readability-braces-around-statements,-modernize-use-auto,-modernize-loop-convert,-readability-else-after-return,-readability-braces-around-statements,-google-runtime-references,-readability-named-parameter,-google-default-arguments,-google-readability-todo,-readability-inconsistent-declaration-parameter-name,-cert-flp30-c,-google-readability-casting,-clang-analyzer-security.FloatLoopCounter,-google-runtime-int,-modernize-use-using,-google-explicit-constructor,-google-build-using-namespace,-cert-err34-c,-clang-analyzer-core.CallAndMessage,-google-readability-function-size,-modernize-make-shared,-modernize-use-nullptr,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-core.NonNullParamChecker,performance-unnecessary-copy-initialization,-readability-simplify-boolean-expr,-modernize-raw-string-literal,-performance-unnecessary-copy-initialization")
ENDIF(NOT CLANG_TIDY_EXE)
ENDIF(WITH_CLANG_TIDY)
ENDIF (WITH_CORE)

#############################################################
56 INSTALL

Large diffs are not rendered by default.

@@ -5,7 +5,7 @@
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
<TITLE>QGIS</TITLE>

<!-- Included doc/style.css -->
<!-- Included /home/fischer/src/qgis/doc/style.css -->
<STYLE TYPE="text/css">
body{ background: white;
color: black;
@@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Saturday October 14, 2017</H3>
<H3>Wednesday November 01, 2017</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Saturday October 14, 2017
Last Change : Saturday October 14, 2017
Last Updated: Wednesday November 01, 2017
Last Change : Wednesday November 01, 2017
</P>
<DIV CLASS="toc">

@@ -214,6 +214,7 @@ <H1>2. Overview</H1>
<LI>QScintilla2
<LI>QCA
<LI>qtkeychain (&gt;= 0.5)
<LI>libzip
</UL>

<P>
@@ -309,27 +310,27 @@ <H2>3.3. Install build dependencies</H2>
</TR>
<TR>
<TD>stretch</TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect</CODE></TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect qt5-default</CODE></TD>
</TR>
<TR>
<TD>xenial</TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect</CODE></TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect qt5-default</CODE></TD>
</TR>
<TR>
<TD>yakkety</TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect</CODE></TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect qt5-default</CODE></TD>
</TR>
<TR>
<TD>zesty</TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect</CODE></TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect qt5-default</CODE></TD>
</TR>
<TR>
<TD>artful</TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect</CODE></TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect qt5-default</CODE></TD>
</TR>
<TR>
<TD>sid</TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect</CODE></TD>
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect qt5-default</CODE></TD>
</TR>
</TABLE>

@@ -2577,7 +2578,7 @@ <H2>5.7. Configure the build</H2>

cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
-D CMAKE_BUILD_TYPE=MINSIZEREL -D ENABLE_TESTS=FALSE \
-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
-D WITH_INTERNAL_SPATIALITE=FALSE \
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
-D QWT_LIBRARY=/usr/local/qwt-5.2.2/lib/libqwt.dylib \
@@ -3060,5 +3061,5 @@ <H1>9. Authors and Acknowledgments</H1>

</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -o doc/INSTALL.html -t html doc/INSTALL.t2t -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build-master-qt5/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
</BODY></HTML>

1 comment on commit ac6c598

@borysiasty

This comment has been minimized.

Copy link
Member Author

@borysiasty borysiasty commented on ac6c598 Nov 1, 2017

oops, sorry for that noise in history

Please sign in to comment.
You can’t perform that action at this time.