Skip to content
Permalink
Browse files

Merge branch 'release-3_4' into backport-fix-help-button-group

  • Loading branch information
m-kuhn committed Feb 27, 2019
2 parents 4311a46 + 8ba90fc commit 06f595b16b34923582ae6d7df75797b4868b4181
Showing with 8,594 additions and 2,934 deletions.
  1. +1 −1 CMakeLists.txt
  2. +2,095 −0 ChangeLog
  3. +8 −2 debian/changelog
  4. +39 −39 doc/TRANSLATORS
  5. +3 −3 doc/api_break.dox
  6. +2 −2 doc/porting_processing.dox
  7. +35 −11 external/libdxfrw/drw_entities.cpp
  8. +14 −1 external/libdxfrw/drw_header.cpp
  9. +14 −2 external/libdxfrw/drw_objects.cpp
  10. +2 −1 external/libdxfrw/intern/drw_textcodec.cpp
  11. +16 −26 external/libdxfrw/intern/dwgbuffer.cpp
  12. +36 −7 external/libdxfrw/intern/dwgreader.cpp
  13. +15 −15 external/libdxfrw/intern/dxfreader.cpp
  14. +12 −1 external/libdxfrw/libdxfrw.cpp
  15. +1,216 −1,145 i18n/qgis_de.ts
  16. +533 −513 i18n/qgis_fr.ts
  17. BIN images/splash/splash.png
  18. +1 −0 linux/org.qgis.qgis.appdata.xml.in
  19. +1 −1 python/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in
  20. +2 −2 python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in
  21. +1 −1 python/analysis/auto_generated/interpolation/qgstininterpolator.sip.in
  22. +1 −1 python/analysis/auto_generated/raster/qgsninecellfilter.sip.in
  23. +1 −1 python/analysis/auto_generated/raster/qgsrastercalculator.sip.in
  24. +1 −1 python/analysis/auto_generated/raster/qgsrelief.sip.in
  25. +2 −2 python/core/auto_generated/locator/qgslocator.sip.in
  26. +6 −3 python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in
  27. +9 −0 python/core/auto_generated/processing/qgsprocessingprovider.sip.in
  28. +1 −1 python/core/auto_generated/qgsauxiliarystorage.sip.in
  29. +3 −3 python/core/auto_generated/qgsfeedback.sip.in
  30. +1 −1 python/core/auto_generated/qgsfiledownloader.sip.in
  31. +1 −1 python/core/auto_generated/qgshistogram.sip.in
  32. +18 −0 python/core/auto_generated/qgslegendsettings.sip.in
  33. +1 −1 python/core/auto_generated/qgsmaprendererjob.sip.in
  34. +1 −1 python/core/auto_generated/qgspointxy.sip.in
  35. +2 −2 python/core/auto_generated/qgsspatialindex.sip.in
  36. +2 −2 python/core/auto_generated/qgsspatialindexkdbush.sip.in
  37. +1 −1 python/core/auto_generated/qgsvectorlayerexporter.sip.in
  38. +2 −2 python/core/auto_generated/qgsvectorlayerutils.sip.in
  39. +11 −0 python/core/auto_generated/raster/qgscontrastenhancement.sip.in
  40. +3 −0 python/core/auto_generated/raster/qgshillshaderenderer.sip.in
  41. +3 −0 python/core/auto_generated/raster/qgsmultibandcolorrenderer.sip.in
  42. +3 −0 python/core/auto_generated/raster/qgspalettedrasterrenderer.sip.in
  43. +1 −1 python/core/auto_generated/raster/qgsrasterdrawer.sip.in
  44. +1 −1 python/core/auto_generated/raster/qgsrasterinterface.sip.in
  45. +1 −1 python/core/auto_generated/raster/qgsrasteriterator.sip.in
  46. +15 −0 python/core/auto_generated/raster/qgsrasterlayer.sip.in
  47. +7 −0 python/core/auto_generated/raster/qgsrasterrenderer.sip.in
  48. +2 −2 python/core/auto_generated/raster/qgsrastertransparency.sip.in
  49. +3 −0 python/core/auto_generated/raster/qgssinglebandgrayrenderer.sip.in
  50. +3 −0 python/core/auto_generated/raster/qgssinglebandpseudocolorrenderer.sip.in
  51. +2 −2 python/gui/auto_generated/locator/qgslocator.sip
  52. +1 −1 python/gui/auto_generated/qgsfiledownloaderdialog.sip.in
  53. +16 −5 python/plugins/db_manager/dlg_sql_window.py
  54. +2 −0 python/plugins/processing/algs/gdal/GdalAlgorithmDialog.py
  55. +1 −1 python/plugins/processing/algs/gdal/GdalUtils.py
  56. +6 −8 python/plugins/processing/algs/gdal/gdaltindex.py
  57. +5 −1 python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
  58. +1 −1 python/plugins/processing/algs/grass7/Grass7Utils.py
  59. +14 −14 python/plugins/processing/algs/qgis/ExportGeometryInfo.py
  60. +26 −6 python/plugins/processing/algs/saga/SagaAlgorithm.py
  61. +2 −7 python/plugins/processing/algs/saga/SagaUtils.py
  62. +27 −3 python/plugins/processing/gui/AlgorithmDialog.py
  63. +6 −0 python/plugins/processing/gui/AlgorithmDialogBase.py
  64. +1 −1 python/plugins/processing/script/ScriptTemplate.py
  65. +36 −39 python/plugins/processing/tests/GdalAlgorithmsTest.py
  66. +57 −1 python/plugins/processing/tests/SagaAlgorithmsTest.py
  67. +48 −0 python/plugins/processing/tests/testdata/expected/add_geometry_info_multipoint.gml
  68. +37 −0 python/plugins/processing/tests/testdata/expected/add_geometry_info_multipoint.xsd
  69. +58 −0 python/plugins/processing/tests/testdata/polys_non_ascii_ñññ.gml
  70. +26 −0 python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
  71. +3 −3 resources/function_help/json/make_polygon
  72. +14 −0 resources/function_help/json/try
  73. BIN resources/srs.db
  74. +1 −1 scripts/spell_check/spelling.dat
  75. +1 −1 src/3d/terrain/qgsdemterraintileloader_p.cpp
  76. +1 −1 src/analysis/interpolation/qgsgridfilewriter.h
  77. +2 −2 src/analysis/interpolation/qgsinterpolator.h
  78. +1 −1 src/analysis/interpolation/qgstininterpolator.h
  79. +1 −1 src/analysis/processing/qgsreclassifyutils.h
  80. +1 −1 src/analysis/raster/qgsalignraster.h
  81. +3 −3 src/analysis/raster/qgsninecellfilter.h
  82. +1 −1 src/analysis/raster/qgsrastercalculator.h
  83. +1 −1 src/analysis/raster/qgsrelief.h
  84. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp
  85. +2 −2 src/analysis/vector/geometry_checker/qgsgeometrymissingvertexcheck.cpp
  86. +2 −2 src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.cpp
  87. +2 −3 src/app/CMakeLists.txt
  88. +64 −35 src/app/dwg/qgsdwgimportdialog.cpp
  89. +505 −235 src/app/dwg/qgsdwgimporter.cpp
  90. +28 −4 src/app/dwg/qgsdwgimporter.h
  91. +1 −1 src/app/layout/qgslayoutattributetablewidget.cpp
  92. +8 −1 src/app/layout/qgslayoutdesignerdialog.cpp
  93. +1 −1 src/app/locator/qgslocatoroptionswidget.h
  94. +1 −1 src/app/qgisappstylesheet.cpp
  95. +4 −0 src/app/qgsoptions.cpp
  96. +27 −5 src/app/qgsrasterlayerproperties.cpp
  97. +7 −0 src/app/qgsrasterlayerproperties.h
  98. +4 −4 src/app/qgssnappingwidget.cpp
  99. +34 −11 src/app/qgsvectorlayerloadstyledialog.cpp
  100. +4 −0 src/app/qgsvectorlayerloadstyledialog.h
  101. +53 −76 src/app/vertextool/{qgsselectedfeature.cpp → qgslockedfeature.cpp}
  102. +12 −20 src/app/vertextool/{qgsselectedfeature.h → qgslockedfeature.h}
  103. +75 −76 src/app/vertextool/qgsvertexeditor.cpp
  104. +49 −24 src/app/vertextool/qgsvertexeditor.h
  105. +0 −83 src/app/vertextool/qgsvertexentry.cpp
  106. +0 −61 src/app/vertextool/qgsvertexentry.h
  107. +127 −62 src/app/vertextool/qgsvertextool.cpp
  108. +7 −5 src/app/vertextool/qgsvertextool.h
  109. +9 −4 src/core/dxf/qgsdxfexport.cpp
  110. +9 −9 src/core/expression/qgsexpression.cpp
  111. +32 −3 src/core/expression/qgsexpressionfunction.cpp
  112. +2 −2 src/core/locator/qgslocator.h
  113. +1 −1 src/core/mesh/qgsmeshlayerrenderer.h
  114. +1 −1 src/core/pal/pal.h
  115. +2 −0 src/core/processing/qgsprocessingalgorithm.cpp
  116. +6 −3 src/core/processing/qgsprocessingalgorithm.h
  117. +13 −3 src/core/processing/qgsprocessingalgrunnertask.cpp
  118. +60 −0 src/core/processing/qgsprocessingprovider.cpp
  119. +9 −0 src/core/processing/qgsprocessingprovider.h
  120. +10 −4 src/core/processing/qgsprocessingutils.cpp
  121. +2 −1 src/core/processing/qgsprocessingutils.h
  122. +1 −1 src/core/providers/memory/qgsmemoryprovider.cpp
  123. +1 −9 src/core/providers/memory/qgsmemoryproviderutils.cpp
  124. +1 −1 src/core/qgsauxiliarystorage.h
  125. +5 −3 src/core/qgsdatadefinedsizelegend.cpp
  126. +3 −3 src/core/qgsfeedback.h
  127. +1 −1 src/core/qgsfiledownloader.h
  128. +8 −4 src/core/qgsgml.cpp
  129. +1 −1 src/core/qgshistogram.h
  130. +1 −1 src/core/qgslabelingengine.cpp
  131. +10 −0 src/core/qgslegendsettings.cpp
  132. +14 −0 src/core/qgslegendsettings.h
  133. +60 −27 src/core/qgsmaplayer.cpp
  134. +1 −1 src/core/qgsmaprendererjob.h
  135. +1 −1 src/core/qgsogrutils.h
  136. +1 −1 src/core/qgspointxy.h
  137. +1 −1 src/core/qgsspatialindex.cpp
  138. +2 −2 src/core/qgsspatialindex.h
  139. +2 −2 src/core/qgsspatialindexkdbush.h
  140. +1 −0 src/core/qgsstringutils.cpp
  141. +1 −1 src/core/qgstaskmanager.h
  142. +2 −2 src/core/qgsvectorfilewriter.h
  143. +1 −1 src/core/qgsvectorlayerexporter.h
  144. +7 −0 src/core/qgsvectorlayerfeatureiterator.cpp
  145. +2 −2 src/core/qgsvectorlayerutils.h
  146. +49 −0 src/core/raster/qgscontrastenhancement.cpp
  147. +9 −0 src/core/raster/qgscontrastenhancement.h
  148. +78 −0 src/core/raster/qgshillshaderenderer.cpp
  149. +2 −0 src/core/raster/qgshillshaderenderer.h
  150. +121 −0 src/core/raster/qgsmultibandcolorrenderer.cpp
  151. +2 −0 src/core/raster/qgsmultibandcolorrenderer.h
  152. +55 −0 src/core/raster/qgspalettedrasterrenderer.cpp
  153. +2 −0 src/core/raster/qgspalettedrasterrenderer.h
  154. +1 −1 src/core/raster/qgsrasterdrawer.h
  155. +1 −1 src/core/raster/qgsrasterinterface.h
  156. +1 −1 src/core/raster/qgsrasteriterator.h
  157. +205 −0 src/core/raster/qgsrasterlayer.cpp
  158. +12 −0 src/core/raster/qgsrasterlayer.h
  159. +1 −1 src/core/raster/qgsrasterlayerrenderer.h
  160. +16 −0 src/core/raster/qgsrasterrenderer.cpp
  161. +5 −0 src/core/raster/qgsrasterrenderer.h
  162. +2 −2 src/core/raster/qgsrastertransparency.h
  163. +153 −0 src/core/raster/qgssinglebandgrayrenderer.cpp
  164. +2 −0 src/core/raster/qgssinglebandgrayrenderer.h
  165. +76 −0 src/core/raster/qgssinglebandpseudocolorrenderer.cpp
  166. +2 −0 src/core/raster/qgssinglebandpseudocolorrenderer.h
  167. +1 −1 src/core/symbology/qgsgraduatedsymbolrenderer.cpp
  168. +5 −12 src/core/symbology/qgsmarkersymbollayer.cpp
  169. +2 −2 src/core/symbology/qgsrulebasedrenderer.cpp
  170. +1 −1 src/gui/qgscurveeditorwidget.h
  171. +2 −2 src/gui/qgsexpressionbuilderwidget.cpp
  172. +1 −1 src/gui/qgsfieldvalueslineedit.cpp
  173. +1 −1 src/gui/qgsfiledownloaderdialog.h
  174. +1 −1 src/gui/raster/qgspalettedrendererwidget.cpp
  175. +2 −2 src/providers/gdal/qgsgdalproviderbase.cpp
  176. +44 −5 src/providers/ogr/qgsogrprovider.cpp
  177. +1 −0 src/providers/ogr/qgsogrprovider.h
  178. +58 −55 src/providers/postgres/qgspostgresconn.cpp
  179. +2 −2 src/providers/postgres/qgspostgresconn.h
  180. +7 −4 src/providers/postgres/qgspostgresprovider.cpp
  181. +10 −0 src/server/services/wms/qgswmsrenderer.cpp
  182. +74 −110 src/ui/qgsvectorlayerloadstyledialog.ui
  183. +32 −6 tests/src/analysis/testqgsprocessing.cpp
  184. +47 −0 tests/src/core/testqgsexpression.cpp
  185. +33 −0 tests/src/core/testqgsgml.cpp
  186. +4 −1 tests/src/providers/CMakeLists.txt
  187. +2 −0 tests/src/python/CMakeLists.txt
  188. +16 −0 tests/src/python/featuresourcetestbase.py
  189. +33 −0 tests/src/python/test_provider_memory.py
  190. +1 −1 tests/src/python/test_provider_ogr_gpkg.py
  191. +28 −0 tests/src/python/test_provider_shapefile.py
  192. +4 −2 tests/src/python/test_provider_spatialite.py
  193. +3 −0 tests/src/python/test_provider_wfs.py
  194. +110 −0 tests/src/python/test_qgsprocessingalgrunner.py
  195. +249 −1 tests/src/python/test_qgsrasterlayer.py
  196. +568 −0 tests/src/python/test_qgsrasterrerderer_createsld.py
  197. +41 −2 tests/src/python/test_qgsrulebasedrenderer.py
  198. +100 −0 tests/src/python/test_qgsserver_wms_getlegendgraphic.py
  199. +21 −0 tests/src/python/test_qgsvectorlayer.py
  200. BIN .../testdata/control_images/data_defined_size_legend/expected_basic_bottom/expected_basic_bottom.png
  201. BIN tests/testdata/control_images/data_defined_size_legend/expected_crowded/expected_crowded.png
  202. BIN ...egend/expected_legend_data_defined_size_collapsed/expected_legend_data_defined_size_collapsed.png
  203. BIN ..._images/qgis_server/WMS_GetLegendGraphic_ScaleSymbol_Max/WMS_GetLegendGraphic_ScaleSymbol_Max.png
  204. BIN ..._images/qgis_server/WMS_GetLegendGraphic_ScaleSymbol_Min/WMS_GetLegendGraphic_ScaleSymbol_Min.png
  205. BIN ..._server/WMS_GetLegendGraphic_ScaleSymbol_Scaled_01/WMS_GetLegendGraphic_ScaleSymbol_Scaled_01.png
  206. BIN ..._server/WMS_GetLegendGraphic_ScaleSymbol_Scaled_02/WMS_GetLegendGraphic_ScaleSymbol_Scaled_02.png
  207. +439 −0 tests/testdata/qgis_server/test_project_scaledsymbols.qgs
@@ -12,7 +12,7 @@ CMAKE_POLICY (SET CMP0053 NEW)
# Project and version
SET(CPACK_PACKAGE_VERSION_MAJOR "3")
SET(CPACK_PACKAGE_VERSION_MINOR "4")
SET(CPACK_PACKAGE_VERSION_PATCH "4")
SET(CPACK_PACKAGE_VERSION_PATCH "5")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Madeira")
PROJECT(qgis VERSION ${COMPLETE_VERSION})

0 comments on commit 06f595b

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