Skip to content
Permalink
Browse files

Merge branch 'master' into reverseLine

  • Loading branch information
lbartoletti committed Aug 27, 2018
2 parents fb45c27 + 3b9821f commit 87fb27fddb86268c6e7392649f43629441333084
Showing with 6,029 additions and 1,056 deletions.
  1. +3 −0 CMakeLists.txt
  2. +4 −4 INSTALL
  3. +14 −14 debian/control.in
  4. +2 −2 debian/rules
  5. +4 −4 doc/INSTALL.html
  6. +1 −1 doc/linux.t2t
  7. +1 −0 images/images.qrc
  8. +163 −0 images/themes/default/mActionAdd3DMap.svg
  9. +9 −1 ms-windows/osgeo4w/package.cmd
  10. +0 −9 ms-windows/osgeo4w/qgis.reg.tmpl
  11. +3 −2 python/console/console_output.py
  12. +1 −1 python/core/auto_generated/geometry/qgsgeometry.sip.in
  13. +2 −0 python/core/auto_generated/layout/qgslayoutitemregistry.sip.in
  14. +12 −0 python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in
  15. +30 −2 python/core/auto_generated/qgsfeaturerequest.sip.in
  16. +86 −0 python/core/auto_generated/qgsgeometryfixes.sip.in
  17. +21 −0 python/core/auto_generated/qgsmaplayerproxymodel.sip.in
  18. +30 −0 python/core/auto_generated/qgsproxyprogresstask.sip.in
  19. +10 −0 python/core/auto_generated/qgsrelation.sip.in
  20. +6 −6 python/core/auto_generated/qgsvectorfilewriter.sip.in
  21. +5 −0 python/core/auto_generated/qgsvectorfilewritertask.sip.in
  22. +10 −3 python/core/auto_generated/qgsvectorlayer.sip.in
  23. +0 −2 python/core/auto_generated/raster/qgsrasterlayer.sip.in
  24. +1 −0 python/core/core_auto.sip
  25. +4 −3 python/gui/auto_generated/qgsabstractdatasourcewidget.sip.in
  26. +3 −7 python/plugins/db_manager/db_plugins/postgis/plugins/versioning/DlgVersioning.ui
  27. +44 −18 python/plugins/processing/algs/gdal/OgrToPostGis.py
  28. +4 −3 python/plugins/processing/algs/gdal/ogr2ogr.py
  29. +44 −18 python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
  30. +2 −2 python/plugins/processing/algs/gdal/ogrinfo.py
  31. +14 −8 python/plugins/processing/algs/qgis/BasicStatistics.py
  32. +11 −6 python/plugins/processing/algs/qgis/FieldPyculator.py
  33. +3 −1 python/plugins/processing/algs/qgis/FieldsCalculator.py
  34. +14 −5 python/plugins/processing/algs/qgis/ImportIntoPostGIS.py
  35. +22 −8 python/plugins/processing/algs/qgis/ImportIntoSpatialite.py
  36. +1 −1 python/plugins/processing/algs/qgis/PointsFromLines.py
  37. +1 −1 python/plugins/processing/algs/qgis/PointsFromPolygons.py
  38. +7 −1 python/plugins/processing/algs/qgis/PostGISExecuteAndLoadSQL.py
  39. +7 −1 python/plugins/processing/algs/qgis/PostGISExecuteSQL.py
  40. +48 −13 python/plugins/processing/algs/qgis/SpatialJoin.py
  41. +3 −0 python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py
  42. +3 −3 python/plugins/processing/algs/saga/description/WatershedSegmentation.txt
  43. +0 −8 python/plugins/processing/core/Processing.py
  44. +0 −16 python/plugins/processing/core/ProcessingConfig.py
  45. +1 −1 python/plugins/processing/gui/AlgorithmDialog.py
  46. +12 −1 python/plugins/processing/gui/DestinationSelectionPanel.py
  47. +106 −0 python/plugins/processing/tests/GdalAlgorithmsTest.py
  48. +125 −0 python/plugins/processing/tests/GuiTest.py
  49. +70 −0 python/plugins/processing/tests/testdata/expected/join_attribute_table_unjoinable.gml
  50. +37 −0 python/plugins/processing/tests/testdata/expected/join_attribute_table_unjoinable.xsd
  51. +35 −0 python/plugins/processing/tests/testdata/expected/join_by_location_unjoinable.gml
  52. +37 −0 python/plugins/processing/tests/testdata/expected/join_by_location_unjoinable.xsd
  53. +41 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_borders.mgrd
  54. +1 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_borders.prj
  55. BIN python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_borders.sdat
  56. +3 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_borders.sdat.aux.xml
  57. +15 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_borders.sgrd
  58. BIN python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_seeds.dbf
  59. +49 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_seeds.mshp
  60. +1 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_seeds.prj
  61. BIN python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_seeds.shp
  62. BIN python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_seeds.shx
  63. +41 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_segments.mgrd
  64. +1 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_segments.prj
  65. +433 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_segments.sdat
  66. +3 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_segments.sdat.aux.xml
  67. +15 −0 python/plugins/processing/tests/testdata/expected/saga/watershed_segmentation_segments.sgrd
  68. +77 −0 python/plugins/processing/tests/testdata/filename with spaces.gml
  69. +37 −0 python/plugins/processing/tests/testdata/filename with spaces.xsd
  70. +38 −0 python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
  71. +23 −0 python/plugins/processing/tests/testdata/saga_algorithm_tests.yaml
  72. +3 −0 python/testing/__init__.py
  73. +1 −1 python/user.py
  74. +1 −1 resources/function_help/json/array
  75. +1 −1 resources/function_help/json/array_append
  76. +1 −1 resources/function_help/json/array_cat
  77. +1 −1 resources/function_help/json/array_distinct
  78. +12 −0 resources/function_help/json/array_filter
  79. +13 −0 resources/function_help/json/array_foreach
  80. +1 −1 resources/function_help/json/array_insert
  81. +1 −1 resources/function_help/json/array_prepend
  82. +1 −1 resources/function_help/json/array_remove_all
  83. +1 −1 resources/function_help/json/array_remove_at
  84. +1 −1 resources/function_help/json/array_reverse
  85. +8 −8 resources/function_help/json/array_slice
  86. +3 −2 resources/function_help/json/array_to_string
  87. +13 −0 resources/function_help/json/generate_series
  88. +1 −1 resources/function_help/json/map
  89. +1 −1 resources/function_help/json/map_akeys
  90. +1 −1 resources/function_help/json/map_avals
  91. +1 −1 resources/function_help/json/map_concat
  92. +1 −1 resources/function_help/json/map_delete
  93. +1 −1 resources/function_help/json/map_insert
  94. +1 −1 resources/function_help/json/now
  95. +2 −2 resources/function_help/json/regexp_matches
  96. +2 −2 resources/function_help/json/string_to_array
  97. +1 −1 resources/function_help/json/with_variable
  98. +2 −0 scripts/update_ts.sh
  99. +4 −0 src/3d/CMakeLists.txt
  100. +12 −0 src/3d/qgs3dmapsettings.cpp
  101. +3 −0 src/3d/qgscameracontroller.cpp
  102. +25 −0 src/3d/qgscamerapose.cpp
  103. +8 −0 src/3d/qgscamerapose.h
  104. +250 −0 src/3d/qgslayoutitem3dmap.cpp
  105. +131 −0 src/3d/qgslayoutitem3dmap.h
  106. +25 −24 src/analysis/CMakeLists.txt
  107. +2 −1 src/analysis/processing/qgsalgorithmextractbyattribute.cpp
  108. +2 −1 src/analysis/processing/qgsalgorithmextractbyexpression.cpp
  109. +53 −14 src/analysis/processing/qgsalgorithmjoinbyattribute.cpp
  110. +4 −3 src/analysis/processing/qgsalgorithmsaveselectedfeatures.cpp
  111. +2 −1 src/analysis/processing/qgsalgorithmuniquevalueindex.cpp
  112. +20 −27 src/analysis/vector/geometry_checker/qgsfeaturepool.cpp
  113. +6 −20 src/analysis/vector/geometry_checker/qgsfeaturepool.h
  114. +2 −2 src/analysis/vector/geometry_checker/qgsgeometryanglecheck.cpp
  115. +1 −3 src/analysis/vector/geometry_checker/qgsgeometryanglecheck.h
  116. +1 −1 src/analysis/vector/geometry_checker/qgsgeometryareacheck.cpp
  117. +1 −3 src/analysis/vector/geometry_checker/qgsgeometryareacheck.h
  118. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp
  119. +29 −10 src/analysis/vector/geometry_checker/qgsgeometrycheck.h
  120. +6 −6 src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp
  121. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
  122. +6 −6 src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h
  123. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.cpp
  124. +1 −3 src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.h
  125. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.cpp
  126. +1 −3 src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.h
  127. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.cpp
  128. +1 −3 src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h
  129. +1 −1 src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp
  130. +2 −4 src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.h
  131. +1 −1 src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.cpp
  132. +1 −3 src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.h
  133. +1 −1 src/analysis/vector/geometry_checker/qgsgeometryfollowboundariescheck.cpp
  134. +1 −3 src/analysis/vector/geometry_checker/qgsgeometryfollowboundariescheck.h
  135. +28 −34 src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp
  136. +2 −4 src/analysis/vector/geometry_checker/qgsgeometrygapcheck.h
  137. +1 −1 src/analysis/vector/geometry_checker/qgsgeometryholecheck.cpp
  138. +1 −3 src/analysis/vector/geometry_checker/qgsgeometryholecheck.h
  139. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp
  140. +1 −3 src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.h
  141. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp
  142. +1 −3 src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.h
  143. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrymultipartcheck.cpp
  144. +1 −3 src/analysis/vector/geometry_checker/qgsgeometrymultipartcheck.h
  145. +3 −3 src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.cpp
  146. +3 −5 src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h
  147. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.cpp
  148. +1 −3 src/analysis/vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.h
  149. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrypointinpolygoncheck.cpp
  150. +1 −3 src/analysis/vector/geometry_checker/qgsgeometrypointinpolygoncheck.h
  151. +3 −3 src/analysis/vector/geometry_checker/qgsgeometrysegmentlengthcheck.cpp
  152. +1 −3 src/analysis/vector/geometry_checker/qgsgeometrysegmentlengthcheck.h
  153. +1 −1 src/analysis/vector/geometry_checker/qgsgeometryselfcontactcheck.cpp
  154. +1 −3 src/analysis/vector/geometry_checker/qgsgeometryselfcontactcheck.h
  155. +1 −1 src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.cpp
  156. +1 −3 src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.h
  157. +0 −2 src/analysis/vector/geometry_checker/qgsgeometrysliverpolygoncheck.h
  158. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrytypecheck.cpp
  159. +1 −3 src/analysis/vector/geometry_checker/qgsgeometrytypecheck.h
  160. +1 −1 src/app/3d/qgsvectorlayer3drendererwidget.cpp
  161. +2 −0 src/app/CMakeLists.txt
  162. +154 −0 src/app/layout/qgslayout3dmapwidget.cpp
  163. +49 −0 src/app/layout/qgslayout3dmapwidget.h
  164. +14 −0 src/app/layout/qgslayoutapputils.cpp
  165. +12 −6 src/app/layout/qgslayoutdesignerdialog.cpp
  166. +14 −2 src/app/layout/qgslayoutlegendlayersdialog.cpp
  167. +2 −2 src/app/layout/qgslayoutlegendlayersdialog.h
  168. +22 −2 src/app/pluginmanager/qgspluginmanager.cpp
  169. +69 −130 src/app/qgisapp.cpp
  170. +9 −17 src/app/qgisapp.h
  171. +1 −1 src/app/qgsmapcanvasdockwidget.cpp
  172. +10 −2 src/app/qgsmaptoolidentifyaction.cpp
  173. +9 −2 src/app/qgsprojectproperties.cpp
  174. +1 −1 src/app/qgsvectorlayerlegendwidget.cpp
  175. +26 −3 src/app/qgsvectorlayerproperties.cpp
  176. +2 −0 src/core/CMakeLists.txt
  177. +28 −13 src/core/expression/qgsexpression.cpp
  178. +246 −13 src/core/expression/qgsexpressionfunction.cpp
  179. +46 −0 src/core/expression/qgsexpressionfunction.h
  180. +1 −1 src/core/geometry/qgsgeometry.h
  181. +2 −0 src/core/layout/qgslayoutexporter.cpp
  182. +1 −0 src/core/layout/qgslayoutitem.h
  183. +11 −0 src/core/layout/qgslayoutitemmap.cpp
  184. +2 −0 src/core/layout/qgslayoutitemregistry.h
  185. +2 −2 src/core/layout/qgslayoutitemscalebar.cpp
  186. +12 −0 src/core/mesh/qgsmeshdataprovider.h
  187. +30 −19 src/core/mesh/qgsmeshlayer.cpp
  188. +11 −6 src/core/mesh/qgsmeshlayerinterpolator.cpp
  189. +2 −0 src/core/mesh/qgsmeshlayerinterpolator.h
  190. +10 −1 src/core/mesh/qgsmeshlayerrenderer.cpp
  191. +2 −1 src/core/mesh/qgsmeshlayerrenderer.h
  192. +7 −0 src/core/mesh/qgsmeshmemorydataprovider.cpp
  193. +1 −0 src/core/mesh/qgsmeshmemorydataprovider.h
  194. +1 −0 src/core/qgsapplication.cpp
  195. +8 −0 src/core/qgsexpressioncontext.cpp
  196. +1 −0 src/core/qgsfeature.h
  197. +14 −3 src/core/qgsfeaturerequest.cpp
  198. +25 −3 src/core/qgsfeaturerequest.h
  199. +52 −0 src/core/qgsgeometryfixes.cpp
  200. +105 −0 src/core/qgsgeometryfixes.h
  201. +1 −1 src/core/qgsmaplayer.cpp
  202. +1 −0 src/core/qgsmaplayer.h
  203. +10 −1 src/core/qgsmaplayerproxymodel.cpp
  204. +20 −0 src/core/qgsmaplayerproxymodel.h
  205. +1 −1 src/core/qgsmessagelog.cpp
  206. +51 −27 src/core/qgsogcutils.cpp
  207. +7 −7 src/core/qgsogcutils.h
  208. +23 −8 src/core/qgsproject.cpp
  209. +20 −0 src/core/qgsproxyprogresstask.cpp
  210. +31 −0 src/core/qgsproxyprogresstask.h
  211. +98 −72 src/core/qgsrelation.cpp
  212. +20 −26 src/core/qgsrelation.h
  213. +71 −0 src/core/qgsrelation_p.h
  214. +2 −6 src/core/qgstranslationcontext.cpp
  215. +39 −21 src/core/qgsvectorfilewriter.cpp
  216. +101 −6 src/core/qgsvectorfilewriter.h
  217. +6 −1 src/core/qgsvectorfilewritertask.cpp
  218. +9 −0 src/core/qgsvectorfilewritertask.h
  219. +49 −15 src/core/qgsvectorlayer.cpp
  220. +13 −4 src/core/qgsvectorlayer.h
  221. +8 −0 src/core/raster/qgsrasterfilewriter.cpp
  222. +1 −4 src/core/raster/qgsrasterlayer.h
  223. +26 −0 src/core/symbology/qgsrulebasedrenderer.cpp
  224. +6 −0 src/crashhandler/qgscrashdialog.cpp
  225. +1 −0 src/crashhandler/qgscrashdialog.h
  226. +1 −1 src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
  227. +11 −5 src/gui/layertree/qgslayertreemapcanvasbridge.cpp
  228. +6 −3 src/gui/qgsabstractdatasourcewidget.h
  229. +0 −2 src/gui/qgsdatasourcemanagerdialog.cpp
  230. +1 −2 src/gui/qgsdatasourcemanagerdialog.h
  231. +7 −7 src/gui/qgsexpressionbuilderwidget.cpp
  232. +3 −3 src/gui/qgsmaptoolcapture.cpp
  233. +2 −2 src/gui/qgsmaptoolcapture.h
  234. +8 −2 src/native/CMakeLists.txt
  235. +10 −1 src/native/mac/qgsmacnative.h
  236. +68 −0 src/native/mac/qgsmacnative.mm
  237. +1 −1 src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp
  238. +1 −1 src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp
  239. +12 −6 src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp
  240. +1 −1 src/plugins/geometry_checker/qgsgeometrycheckfixdialog.cpp
  241. +2 −2 src/plugins/grass/qtermwidget/tools.cpp
  242. +1 −2 src/providers/delimitedtext/qgsdelimitedtextfile.cpp
  243. +13 −0 src/providers/mdal/qgsmdalprovider.cpp
  244. +1 −0 src/providers/mdal/qgsmdalprovider.h
  245. +2 −2 src/providers/ogr/qgsogrfeatureiterator.cpp
  246. +11 −2 src/providers/oracle/qgsoracledataitems.cpp
  247. +2 −0 src/providers/oracle/qgsoracledataitems.h
  248. +1 −1 src/providers/oracle/qgsoraclefeatureiterator.cpp
  249. +12 −2 src/providers/oracle/qgsoraclesourceselect.cpp
  250. +2 −2 src/providers/oracle/qgsoraclesourceselect.h
  251. +9 −1 src/providers/postgres/qgspgsourceselect.cpp
  252. +3 −0 src/providers/postgres/qgspgsourceselect.h
  253. +1 −1 src/providers/postgres/qgspostgresfeatureiterator.cpp
  254. +1 −1 src/providers/spatialite/qgsspatialitefeatureiterator.cpp
  255. +17 −0 src/providers/wfs/qgswfsfeatureiterator.cpp
  256. +2 −0 src/providers/wfs/qgswfsfeatureiterator.h
  257. +13 −3 src/providers/wms/qgstilescalewidget.cpp
  258. +1 −0 src/providers/wms/qgstilescalewidget.h
  259. +3 −1 src/quickgui/plugin/editor/qgsquicktextedit.qml
  260. +6 −0 src/quickgui/qgsquickidentifykit.cpp
  261. +39 −4 src/quickgui/qgsquickidentifykit.h
  262. +227 −0 src/ui/layout/qgslayout3dmapwidgetbase.ui
  263. +23 −2 src/ui/layout/qgslayoutlegendlayersdialogbase.ui
  264. +2 −2 src/ui/qgsattributeactiondialogbase.ui
  265. +25 −17 src/ui/qgsprojectpropertiesbase.ui
  266. +7 −7 src/ui/qgsrasterlayerpropertiesbase.ui
  267. +4 −4 src/ui/qgsstylemanagerdialogbase.ui
  268. +443 −56 src/ui/qgsvectorlayerpropertiesbase.ui
  269. +2 −2 src/ui/symbollayer/widget_symbolslist.ui
  270. +9 −0 tests/code_layout/test_banned_keywords.sh
  271. +1 −0 tests/src/3d/CMakeLists.txt
  272. +130 −0 tests/src/3d/testqgslayout3dmap.cpp
  273. +1 −0 tests/src/core/CMakeLists.txt
  274. +50 −7 tests/src/core/testqgsexpression.cpp
  275. +6 −0 tests/src/core/testqgslayoutitem.cpp
  276. +44 −0 tests/src/core/testqgsmeshlayer.cpp
  277. +41 −12 tests/src/core/testqgsmeshlayerrenderer.cpp
  278. +36 −0 tests/src/core/testqgsrulebasedrenderer.cpp
  279. +111 −0 tests/src/core/testqgssqliteexpressioncompiler.cpp
  280. +2 −2 tests/src/core/testqgstranslateproject.cpp
  281. +34 −0 tests/src/core/testqgsvectorfilewriter.cpp
  282. +1 −0 tests/src/python/CMakeLists.txt
  283. +1 −1 tests/src/python/test_provider_postgres.py
  284. +2 −2 tests/src/python/test_qgsdelimitedtextprovider_wanted.py
  285. +2 −1 tests/src/python/test_qgsfeaturesource.py
  286. +136 −0 tests/src/python/test_qgsmaplayerproxymodel.py
  287. +37 −2 tests/src/python/test_qgsserver_wfs.py
  288. +41 −0 tests/src/python/test_qgsvectorfilewriter.py
  289. +27 −0 tests/src/python/test_qgsvectorfilewritertask.py
  290. +57 −0 tests/src/python/test_qgsvectorlayer.py
  291. BIN tests/testdata/control_images/composer_3d/expected_composer3d_basic/expected_composer3d_basic.png
  292. BIN ...ataset_with_inactive_face/expected_quad_and_triangle_vertex_scalar_dataset_with_inactive_face.png
  293. +25 −0 tests/testdata/mesh/quad_and_triangle_vertex_scalar_with_inactive_face.dat
  294. BIN tests/testdata/polys_overlapping_with_id.dbf
@@ -332,6 +332,9 @@ IF(WITH_CORE)
FIND_PACKAGE(Qt53DExtras REQUIRED)
SET(HAVE_3D TRUE) # used in qgsconfig.h
ENDIF (WITH_3D)
IF (APPLE)
FIND_PACKAGE(Qt5MacExtras REQUIRED)
ENDIF (APPLE)
INCLUDE("cmake/modules/ECMQt4To5Porting.cmake")
MESSAGE(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
IF (WITH_QUICK)
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Friday August 10, 2018
Wednesday August 22, 2018


Last Updated: Friday August 10, 2018
Last Change : Friday August 10, 2018
Last Updated: Wednesday August 22, 2018
Last Change : Wednesday August 22, 2018


1. Introduction
@@ -184,7 +184,7 @@ Now update your local sources database:
| buster | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect 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 libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
| xenial | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect 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 libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
| bionic | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect 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 libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
| cosmic | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect 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 libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
| cosmic | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect 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 libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
| sid | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect 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 libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |

(extracted from the control.in file in debian/)
@@ -41,7 +41,7 @@ Build-Depends:
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
#sid buster bionic cosmic# libosgearth-dev,
#bionic cosmic# qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#bionic# qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#oracle# oracle-instantclient12.1-devel, oracle-instantclient12.1-basiclite,
locales, ca-certificates, ninja-build
Build-Conflicts: libqgis-dev, qgis-dev
@@ -148,19 +148,19 @@ Description: QGIS - shared native gui library
.
This package contains the shared native gui library.

#bionic cosmic#Package: libqgis-3d{QGIS_ABI}
#bionic cosmic#Architecture: any
#bionic cosmic#Section: libs
#bionic cosmic#Depends:
#bionic cosmic# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#bionic cosmic# ${shlibs:Depends},
#bionic cosmic# ${misc:Depends}
#bionic cosmic#Description: QGIS - shared 3d library
#bionic cosmic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#bionic cosmic# display databases of geographic information.
#bionic cosmic# .
#bionic cosmic# This package contains the shared 3d library.
#bionic cosmic#
#bionic#Package: libqgis-3d{QGIS_ABI}
#bionic#Architecture: any
#bionic#Section: libs
#bionic#Depends:
#bionic# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#bionic# ${shlibs:Depends},
#bionic# ${misc:Depends}
#bionic#Description: QGIS - shared 3d library
#bionic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#bionic# display databases of geographic information.
#bionic# .
#bionic# This package contains the shared 3d library.
#bionic#
Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
Architecture: any
Section: libs
@@ -104,8 +104,8 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster stretch"))
CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
endif

ifneq (,$(findstring $(DISTRIBUTION),"artful bionic cosmic"))
# Only on ubuntu - Qt3DExtras intentionally removed from debian (#895386)
ifneq (,$(findstring $(DISTRIBUTION),"bionic"))
# Only on bionic - Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu
CMAKE_OPTS += \
-DWITH_3D=TRUE \
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
@@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Friday August 10, 2018</H3>
<H3>Wednesday August 22, 2018</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Friday August 10, 2018
Last Change : Friday August 10, 2018
Last Updated: Wednesday August 22, 2018
Last Change : Wednesday August 22, 2018
</P>
<DIV CLASS="toc">

@@ -327,7 +327,7 @@ <H2>3.3. Install build dependencies</H2>
</TR>
<TR>
<TD>cosmic</TD>
<TD><CODE>apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect 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 libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb</CODE></TD>
<TD><CODE>apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect 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 libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb</CODE></TD>
</TR>
<TR>
<TD>sid</TD>

0 comments on commit 87fb27f

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