Skip to content
Permalink
Browse files
Merge branch 'qgis:master' into master
  • Loading branch information
andreassteffens committed Jun 1, 2021
2 parents 4b4748c + c1d7e91 commit 18bbfa9af4eb1a0e8e948f5e641a8d3e56c1a966
Showing with 4,605 additions and 2,430 deletions.
  1. +1 −1 .github/workflows/build-docker.yml
  2. +4 −4 .github/workflows/macos-build.yml
  3. +2 −2 .github/workflows/mingw64.yml
  4. +2 −2 .github/workflows/run-tests.yml
  5. +14 −1 cmake/FindOpenCLhpp.cmake
  6. +3 −0 cmake_templates/qgsconfig.h.in
  7. +8 −1 doc/api_break.dox
  8. +7 −0 python/3d/auto_additions/qgsabstractmaterialsettings.py
  9. +109 −0 python/core/auto_additions/qgis.py
  10. +4 −0 python/core/auto_additions/qgsprocessingutils.py
  11. +4 −0 python/core/auto_additions/qgsproject.py
  12. +6 −0 python/core/auto_generated/browser/qgsconnectionsitem.sip.in
  13. +6 −0 python/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in
  14. +6 −0 python/core/auto_generated/browser/qgsdatacollectionitem.sip.in
  15. +20 −1 python/core/auto_generated/browser/qgsdataitem.sip.in
  16. +70 −0 python/core/auto_generated/browser/qgsdirectoryitem.sip.in
  17. +6 −0 python/core/auto_generated/browser/qgsfavoritesitem.sip.in
  18. +12 −0 python/core/auto_generated/browser/qgsfieldsitem.sip.in
  19. +6 −0 python/core/auto_generated/browser/qgslayeritem.sip.in
  20. +6 −0 python/core/auto_generated/browser/qgsprojectitem.sip.in
  21. +6 −0 python/core/auto_generated/browser/qgszipitem.sip.in
  22. +1 −1 python/core/auto_generated/layertree/qgslayertreemodel.sip.in
  23. +1 −1 python/core/auto_generated/locator/qgslocatorfilter.sip.in
  24. +2 −3 python/core/auto_generated/maprenderer/qgsmaprenderercustompainterjob.sip.in
  25. +3 −3 python/core/auto_generated/maprenderer/qgsmaprendererjob.sip.in
  26. +0 −2 python/core/auto_generated/maprenderer/qgsmaprendererparalleljob.sip.in
  27. +0 −2 python/core/auto_generated/maprenderer/qgsmaprenderersequentialjob.sip.in
  28. +10 −3 python/core/auto_generated/qgis.sip.in
  29. +5 −0 python/core/auto_generated/qgsmaptopixel.sip.in
  30. +3 −3 python/core/auto_generated/qgsmessagelog.sip.in
  31. +2 −2 python/core/auto_generated/qgsreadwritecontext.sip.in
  32. +8 −1 python/core/auto_generated/symbology/qgssymbol.sip.in
  33. +3 −0 python/gui/auto_additions/qgsadvanceddigitizingdockwidget.py
  34. +1 −1 python/gui/auto_generated/processing/models/qgsmodelgraphicsscene.sip.in
  35. +1 −1 python/gui/auto_generated/qgsdataitemguiprovider.sip.in
  36. +1 −1 python/gui/auto_generated/qgsmapcanvas.sip.in
  37. +1 −1 python/gui/auto_generated/qgsmaptool.sip.in
  38. +6 −6 python/gui/auto_generated/qgsmessagebar.sip.in
  39. +4 −4 python/gui/auto_generated/qgsmessagebaritem.sip.in
  40. +1 −1 python/gui/auto_generated/qgspluginmanagerinterface.sip.in
  41. +1 −1 python/plugins/processing/gui/HistoryDialog.py
  42. +1 −1 python/server/auto_generated/qgsserversettings.sip.in
  43. +3 −0 scripts/sipify.pl
  44. +4 −1 src/3d/mesh/qgsmeshterraingenerator.cpp
  45. +1 −1 src/analysis/interpolation/qgsinterpolator.cpp
  46. +1 −1 src/analysis/interpolation/qgstininterpolator.cpp
  47. +1 −1 src/analysis/processing/qgsalgorithmbuffer.cpp
  48. +2 −2 src/analysis/raster/qgsninecellfilter.cpp
  49. +1 −1 src/analysis/raster/qgsrastercalculator.cpp
  50. +3 −3 src/app/3d/qgs3dmapconfigwidget.cpp
  51. +11 −1 src/app/CMakeLists.txt
  52. +23 −2 src/app/browser/qgsinbuiltdataitemproviders.cpp
  53. +1 −0 src/app/browser/qgsinbuiltdataitemproviders.h
  54. +4 −4 src/app/dwg/qgsdwgimportdialog.cpp
  55. +14 −14 src/app/georeferencer/qgsgeorefmainwindow.cpp
  56. +1 −1 src/app/gps/qgsgpsbearingitem.cpp
  57. +1 −1 src/app/gps/qgsgpsmarker.cpp
  58. +1 −1 src/app/labeling/qgsmaptoolshowhidelabels.cpp
  59. +13 −13 src/app/layout/qgslayoutdesignerdialog.cpp
  60. +119 −0 src/app/locator/qgsactionlocatorfilter.cpp
  61. +55 −0 src/app/locator/qgsactionlocatorfilter.h
  62. +311 −0 src/app/locator/qgsactivelayerfeatureslocatorfilter.cpp
  63. +75 −0 src/app/locator/qgsactivelayerfeatureslocatorfilter.h
  64. +242 −0 src/app/locator/qgsalllayersfeatureslocatorfilter.cpp
  65. +72 −0 src/app/locator/qgsalllayersfeatureslocatorfilter.h
  66. +71 −0 src/app/locator/qgsbookmarklocatorfilter.cpp
  67. +43 −0 src/app/locator/qgsbookmarklocatorfilter.h
  68. +66 −0 src/app/locator/qgsexpressioncalculatorlocatorfilter.cpp
  69. +44 −0 src/app/locator/qgsexpressioncalculatorlocatorfilter.h
  70. +292 −0 src/app/locator/qgsgotolocatorfilter.cpp
  71. +47 −0 src/app/locator/qgsgotolocatorfilter.h
  72. +0 −1,221 src/app/locator/qgsinbuiltlocatorfilters.cpp
  73. +0 −277 src/app/locator/qgsinbuiltlocatorfilters.h
  74. +68 −0 src/app/locator/qgslayertreelocatorfilter.cpp
  75. +47 −0 src/app/locator/qgslayertreelocatorfilter.h
  76. +68 −0 src/app/locator/qgslayoutlocatorfilter.cpp
  77. +47 −0 src/app/locator/qgslayoutlocatorfilter.h
  78. +53 −0 src/app/locator/qgsnominatimlocatorfilter.cpp
  79. +37 −0 src/app/locator/qgsnominatimlocatorfilter.h
  80. +106 −0 src/app/locator/qgssettingslocatorfilter.cpp
  81. +47 −0 src/app/locator/qgssettingslocatorfilter.h
  82. +1 −1 src/app/pluginmanager/qgsapppluginmanagerinterface.h
  83. +2 −2 src/app/pluginmanager/qgspluginmanager.cpp
  84. +149 −132 src/app/qgisapp.cpp
  85. +1 −1 src/app/qgisapp.h
  86. +1 −1 src/app/qgisappinterface.cpp
  87. +6 −6 src/app/qgsappcoordinateoperationhandlers.cpp
  88. +3 −3 src/app/qgsappscreenshots.cpp
  89. +2 −2 src/app/qgsattributetabledialog.cpp
  90. +3 −3 src/app/qgsguivectorlayertools.cpp
  91. +1 −1 src/app/qgshandlebadlayers.cpp
  92. +2 −2 src/app/qgsidentifyresultsdialog.cpp
  93. +3 −3 src/app/qgsmaptooladdpart.cpp
  94. +2 −2 src/app/qgsmaptooladdring.cpp
  95. +1 −1 src/app/qgsmaptoolannotation.cpp
  96. +1 −1 src/app/qgsmaptoolcircle2tangentspoint.cpp
  97. +1 −1 src/app/qgsmaptoolcircle3tangents.cpp
  98. +2 −2 src/app/qgsmaptoolfeatureaction.cpp
  99. +3 −3 src/app/qgsmaptoolfillring.cpp
  100. +1 −1 src/app/qgsmaptoolidentifyaction.cpp
  101. +1 −1 src/app/qgsmaptoolmovefeature.cpp
  102. +4 −4 src/app/qgsmaptooloffsetcurve.cpp
  103. +1 −1 src/app/qgsmaptooloffsetpointsymbol.cpp
  104. +1 −1 src/app/qgsmaptoolpointsymbol.cpp
  105. +4 −4 src/app/qgsmaptoolreshape.cpp
  106. +1 −1 src/app/qgsmaptoolrotatepointsymbols.cpp
  107. +5 −5 src/app/qgsmaptoolselectutils.cpp
  108. +5 −5 src/app/qgsmaptoolsplitfeatures.cpp
  109. +5 −5 src/app/qgsmaptoolsplitparts.cpp
  110. +4 −4 src/app/qgspluginregistry.cpp
  111. +4 −3 src/app/qgsprojectproperties.cpp
  112. +6 −9 src/app/qgsrastercalcdialog.cpp
  113. +3 −3 src/app/qgsselectbyformdialog.cpp
  114. +2 −2 src/app/qgstemporalcontrollerdockwidget.cpp
  115. +3 −3 src/app/vertextool/qgsvertextool.cpp
  116. +3 −3 src/auth/oauth2/gui/qgsauthoauth2edit.cpp
  117. +8 −0 src/core/browser/qgsconnectionsitem.h
  118. +8 −0 src/core/browser/qgsdatabaseschemaitem.h
  119. +8 −0 src/core/browser/qgsdatacollectionitem.h
  120. +5 −0 src/core/browser/qgsdataitem.cpp
  121. +22 −1 src/core/browser/qgsdataitem.h
  122. +172 −4 src/core/browser/qgsdirectoryitem.cpp
  123. +83 −0 src/core/browser/qgsdirectoryitem.h
  124. +1 −1 src/core/browser/qgsfavoritesitem.cpp
  125. +8 −0 src/core/browser/qgsfavoritesitem.h
  126. +16 −0 src/core/browser/qgsfieldsitem.h
  127. +8 −0 src/core/browser/qgslayeritem.h
  128. +8 −0 src/core/browser/qgsprojectitem.h
  129. +8 −0 src/core/browser/qgszipitem.h
  130. +1 −1 src/core/layertree/qgslayertreemodel.h
  131. +1 −1 src/core/layout/qgslayoutexporter.cpp
  132. +1 −1 src/core/locator/qgslocatorfilter.h
  133. +1 −1 src/core/maprenderer/qgsmaprenderercustompainterjob.cpp
  134. +4 −2 src/core/maprenderer/qgsmaprenderercustompainterjob.h
  135. +9 −1 src/core/maprenderer/qgsmaprendererjob.cpp
  136. +11 −3 src/core/maprenderer/qgsmaprendererjob.h
  137. +1 −1 src/core/maprenderer/qgsmaprendererparalleljob.cpp
  138. +2 −1 src/core/maprenderer/qgsmaprendererparalleljob.h
  139. +1 −1 src/core/maprenderer/qgsmaprenderersequentialjob.cpp
  140. +2 −1 src/core/maprenderer/qgsmaprenderersequentialjob.h
  141. +1 −1 src/core/maprenderer/qgsmaprendererstagedrenderjob.cpp
  142. +2 −1 src/core/maprenderer/qgsmaprendererstagedrenderjob.h
  143. +3 −3 src/core/processing/qgsprocessingalgorithm.cpp
  144. +2 −2 src/core/processing/qgsprocessingalgrunnertask.cpp
  145. +6 −6 src/core/processing/qgsprocessingfeedback.cpp
  146. +6 −6 src/core/proj/qgscoordinatetransform_p.cpp
  147. +3 −3 src/core/project/qgsproject.cpp
  148. +1 −1 src/core/providers/ogr/qgsgeopackagedataitems.cpp
  149. +4 −4 src/core/providers/ogr/qgsgeopackageprojectstorage.cpp
  150. +9 −9 src/core/providers/ogr/qgsgeopackageproviderconnection.cpp
  151. +3 −3 src/core/providers/ogr/qgsogrprovider.cpp
  152. +25 −3 src/core/qgis.h
  153. +1 −1 src/core/qgsfeature.cpp
  154. +6 −0 src/core/qgsfileutils.cpp
  155. +3 −3 src/core/qgsgml.cpp
  156. +10 −7 src/core/qgsmapsettings.cpp
  157. +19 −1 src/core/qgsmaptopixel.cpp
  158. +16 −0 src/core/qgsmaptopixel.h
  159. +4 −4 src/core/qgsmessagelog.cpp
  160. +3 −3 src/core/qgsmessagelog.h
  161. +10 −10 src/core/qgsopenclutils.cpp
  162. +6 −0 src/core/qgsopenclutils.h
  163. +2 −2 src/core/qgsreadwritecontext.h
  164. +7 −5 src/core/qgsrelationmanager.cpp
  165. +12 −12 src/core/qgsunittypes.h
  166. +3 −3 src/core/raster/qgshillshaderenderer.cpp
  167. +4 −0 src/core/symbology/qgsmarkersymbol.cpp
  168. +19 −1 src/core/symbology/qgsmarkersymbollayer.cpp
  169. +2 −0 src/core/symbology/qgsmarkersymbollayer.h
  170. +4 −0 src/core/symbology/qgssymbol.cpp
  171. +6 −1 src/core/symbology/qgssymbol.h
  172. +6 −2 src/core/vector/qgsvectorlayer.cpp
  173. +22 −14 src/core/vector/qgsvectorlayerfeatureiterator.cpp
  174. +10 −8 src/core/vector/qgsvectorlayerjoinbuffer.cpp
  175. +2 −2 src/gui/attributetable/qgsfeaturefilterwidget.cpp
  176. +6 −6 src/gui/auth/qgsauthauthoritieseditor.cpp
  177. +21 −21 src/gui/auth/qgsauthguiutils.cpp
  178. +3 −3 src/gui/auth/qgsauthidentitieseditor.cpp
  179. +5 −5 src/gui/auth/qgsauthserverseditor.cpp
  180. +4 −0 src/gui/auth/qgsauthsslconfigwidget.cpp
  181. +1 −0 src/gui/codeeditors/qgscodeeditorexpression.cpp
  182. +1 −1 src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp
  183. +90 −22 src/gui/editorwidgets/qgsjsoneditwidget.cpp
  184. +8 −1 src/gui/editorwidgets/qgsjsoneditwidget.h
  185. +1 −1 src/gui/labeling/qgslabelengineconfigdialog.cpp
  186. +2 −2 src/gui/layertree/qgslayertreeview.cpp
  187. +2 −2 src/gui/processing/models/qgsmodelcomponentgraphicitem.cpp
  188. +6 −6 src/gui/processing/models/qgsmodeldesignerdialog.cpp
  189. +1 −1 src/gui/processing/models/qgsmodelgraphicsscene.cpp
  190. +1 −1 src/gui/processing/models/qgsmodelgraphicsscene.h
  191. +1 −1 src/gui/processing/qgsprocessingalgorithmdialogbase.cpp
  192. +2 −2 src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
  193. +12 −12 src/gui/providers/ogr/qgsgeopackageitemguiprovider.cpp
  194. +2 −2 src/gui/qgsabstractrelationeditorwidget.cpp
  195. +9 −10 src/gui/qgsattributeform.cpp
  196. +1 −1 src/gui/qgsdataitemguiprovider.cpp
  197. +1 −1 src/gui/qgsdataitemguiprovider.h
  198. +1 −1 src/gui/qgsdatasourcemanagerdialog.cpp
  199. +4 −4 src/gui/qgsexpressionselectiondialog.cpp
  200. +1 −1 src/gui/qgsfilecontentsourcelineedit.cpp
  201. +1 −1 src/gui/qgsgui.cpp
  202. +1 −1 src/gui/qgshelp.cpp
  203. +6 −6 src/gui/qgsmapcanvas.cpp
  204. +1 −1 src/gui/qgsmapcanvas.h
  205. +1 −1 src/gui/qgsmapcanvastracer.cpp
  206. +1 −1 src/gui/qgsmaplayerloadstyledialog.cpp
  207. +1 −1 src/gui/qgsmaptool.h
  208. +8 −8 src/gui/qgsmaptooldigitizefeature.cpp
  209. +1 −1 src/gui/qgsmaptoolidentify.cpp
  210. +1 −1 src/gui/qgsmaskingwidget.cpp
  211. +13 −13 src/gui/qgsmessagebar.cpp
  212. +7 −7 src/gui/qgsmessagebar.h
  213. +7 −7 src/gui/qgsmessagebaritem.cpp
  214. +4 −4 src/gui/qgsmessagebaritem.h
  215. +5 −5 src/gui/qgsmessagelogviewer.cpp
  216. +1 −1 src/gui/qgspluginmanagerinterface.h
  217. +1 −1 src/gui/qgsprojectionselectiontreewidget.cpp
  218. +4 −1 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  219. +1 −0 src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
  220. +1 −1 src/gui/symbology/qgssymbolselectordialog.cpp
  221. +6 −2 src/gui/vector/qgsfieldcalculator.cpp
  222. +6 −1 src/gui/vector/qgssourcefieldsproperties.cpp
  223. +7 −5 src/gui/vector/qgsvectorlayerproperties.cpp
  224. +1 −1 src/plugins/grass/qgsgrassplugin.cpp
  225. +1 −1 src/plugins/topology/topolError.cpp
  226. +1 −1 src/process/qgsprocess.cpp
  227. +3 −3 src/providers/db2/qgsdb2newconnection.cpp
  228. +1 −1 src/providers/grass/qgsgrass.cpp
  229. +63 −60 src/providers/grass/qgsgrassprovidermodule.cpp
  230. +25 −12 src/providers/grass/qgsgrassprovidermodule.h
  231. +2 −2 src/providers/hana/qgshananewconnection.cpp
  232. +2 −2 src/providers/oracle/qgsoraclenewconnection.cpp
  233. +9 −9 src/providers/pdal/qgspdaleptgenerationtask.cpp
  234. +2 −2 src/providers/postgres/qgspgnewconnection.cpp
  235. +15 −0 src/providers/postgres/qgspgsourceselect.cpp
  236. +60 −14 src/providers/postgres/qgspostgresconn.cpp
  237. +8 −8 src/providers/postgres/qgspostgresprojectstorage.cpp
  238. +45 −45 src/providers/postgres/raster/qgspostgresrasterprovider.cpp
  239. +6 −6 src/providers/postgres/raster/qgspostgresrastershareddata.cpp
  240. +3 −3 src/providers/postgres/raster/qgspostgresrasterutils.cpp
  241. +1 −1 src/providers/spatialite/qgsspatialiteprovider.cpp
  242. +7 −7 src/providers/spatialite/qgsspatialiteproviderconnection.cpp
  243. +2 −2 src/providers/wfs/qgswfsdataitems.cpp
  244. +1 −1 src/providers/wms/qgswmsprovider.cpp
  245. +1 −1 src/server/qgis_map_serv.cpp
  246. +4 −4 src/server/qgis_mapserver.cpp
  247. +5 −5 src/server/qgsaccesscontrolfilter.cpp
  248. +6 −6 src/server/qgsconfigcache.cpp
  249. +7 −7 src/server/qgsfcgiserverrequest.cpp
  250. +1 −1 src/server/qgsrequesthandler.cpp
  251. +30 −27 src/server/qgsserver.cpp
  252. +5 −5 src/server/qgsserverapiutils.cpp
  253. +1 −1 src/server/qgsserverlogger.h
  254. +3 −3 src/server/qgsserverogcapi.cpp
  255. +7 −7 src/server/qgsserverogcapihandler.cpp
  256. +5 −5 src/server/qgsserverplugins.cpp
  257. +4 −4 src/server/qgsserversettings.cpp
  258. +1 −1 src/server/qgsserversettings.h
  259. +1 −1 src/server/qgsserverstatichandler.cpp
  260. +3 −3 src/server/qgsserviceregistry.cpp
  261. +1 −1 src/server/services/wfs/qgswfsparameters.cpp
  262. +2 −2 src/server/services/wfs/qgswfstransaction.cpp
  263. +2 −2 src/server/services/wfs3/qgswfs3handlers.cpp
  264. +2 −2 src/server/services/wms/qgsmaprendererjobproxy.cpp
  265. +6 −0 src/server/services/wms/qgswmsgetmap.cpp
  266. +2 −2 src/server/services/wms/qgswmsgetschemaextension.cpp
  267. +1 −1 src/server/services/wms/qgswmsparameters.cpp
  268. +1 −1 src/server/services/wms/qgswmsrenderer.cpp
  269. +1 −1 src/server/services/wmts/qgswmtsparameters.cpp
  270. +1 −1 tests/code_layout/acceptable_missing_doc.py
  271. +160 −0 tests/src/analysis/testqgsinterpolator.cpp
  272. +11 −1 tests/src/app/testqgsapplocatorfilters.cpp
  273. +203 −12 tests/src/core/testqgsdataitem.cpp
  274. +21 −0 tests/src/core/testqgsfontmarker.cpp
  275. +1 −1 tests/src/core/testqgsprojectstorage.cpp
  276. +1 −1 tests/src/core/testqgssimplemarker.cpp
  277. +4 −4 tests/src/gui/testqgsmessagebar.cpp
  278. +15 −0 tests/src/gui/testqgssinglebandpseudocolorrendererwidget.cpp
  279. +72 −0 tests/src/python/test_qgsproviderconnection_postgres.py
  280. +76 −1 tests/src/python/test_qgssymbol.py
  281. +189 −0 tests/src/python/test_qgsvectorlayer.py
  282. BIN ...rol_images/symbol/expected_marker_bounds_layer_disabled/expected_marker_bounds_layer_disabled.png
  283. BIN .../control_images/symbol_fontmarker/expected_fontmarker_largesize/expected_fontmarker_largesize.png
@@ -64,7 +64,7 @@ jobs:
- name: Cache
id: cache
uses: actions/cache@v2.1.5
uses: actions/cache@v2.1.6
with:
path: ~/.ccache
key: docker-build-${{ matrix.branch }}-${{ github.sha }}
@@ -45,7 +45,7 @@ jobs:
- uses: actions/checkout@v2

- name: Prepare build cache for pull request
uses: pat-s/always-upload-cache@v2.1.3
uses: pat-s/always-upload-cache@v2.1.5
if: github.event_name == 'pull_request'
with:
path: ${{ env.CCACHE_DIR }}
@@ -59,7 +59,7 @@ jobs:
- name: Prepare build cache for branch/tag
# use a fork of actions/cache@v2 to upload cache even when the build or test failed
uses: pat-s/always-upload-cache@v2.1.3
uses: pat-s/always-upload-cache@v2.1.5
if: github.event_name != 'pull_request'
with:
path: ${{ env.CCACHE_DIR }}
@@ -73,7 +73,7 @@ jobs:
# Qt caching
- name: Cache Qt
id: cache-qt
uses: pat-s/always-upload-cache@v2.1.3
uses: pat-s/always-upload-cache@v2.1.5
with:
path: ${{ env.DEPS_CACHE_DIR }}/Qt/${{ env.QT_VERSION }}
key: mac-qt-v4-${{ env.QT_VERSION }}
@@ -96,7 +96,7 @@ jobs:
# QGIS-deps caching
- name: Cache qgis-deps
id: cache-deps
uses: pat-s/always-upload-cache@v2.1.3
uses: pat-s/always-upload-cache@v2.1.5
with:
path: ${{ env.DEPS_CACHE_DIR }}/QGIS/qgis-deps-${{ env.QGIS_DEPS_VERSION }}
key: mac-qgis-deps-v4-${{ env.QGIS_DEPS_VERSION }}
@@ -49,7 +49,7 @@ jobs:
pull_image_and_stages: ${{ github.event_name != 'workflow_dispatch' }}

- name: Prepare build cache for pull request
uses: pat-s/always-upload-cache@v2.1.3
uses: pat-s/always-upload-cache@v2.1.5
if: github.event_name == 'pull_request'
with:
path: ${{ github.workspace }}/.ccache
@@ -63,7 +63,7 @@ jobs:
- name: Prepare build cache for branch/tag
# use a fork of actions/cache@v2 to upload cache even when the build or test failed
uses: pat-s/always-upload-cache@v2.1.3
uses: pat-s/always-upload-cache@v2.1.5
if: github.event_name != 'pull_request'
with:
path: ${{ github.workspace }}/.ccache
@@ -94,7 +94,7 @@ jobs:
docker push "qgis/qgis3-build-deps:${DOCKER_TAG}"
- name: Prepare build cache for pull request
uses: pat-s/always-upload-cache@v2.1.3
uses: pat-s/always-upload-cache@v2.1.5
if: github.event_name == 'pull_request'
with:
path: /home/runner/QGIS/.ccache
@@ -108,7 +108,7 @@ jobs:
- name: Prepare build cache for branch/tag
# use a fork of actions/cache@v2 to upload cache even when the build or test failed
uses: pat-s/always-upload-cache@v2.1.3
uses: pat-s/always-upload-cache@v2.1.5
if: github.event_name != 'pull_request'
with:
path: /home/runner/QGIS/.ccache
@@ -19,7 +19,7 @@ if (OPENCL_HPP_INCLUDE_DIR)
SET(OPENCL_HPP_FOUND TRUE)
else ()
find_path(OPENCL_HPP_INCLUDE_DIR
NAMES CL/cl2.hpp
NAMES CL/opencl.hpp CL/cl2.hpp
PATHS
${LIB_DIR}/include
"$ENV{LIB_DIR}/include"
@@ -36,6 +36,19 @@ endif ()


if (OPENCL_HPP_FOUND)
# see if newer opencl.hpp file exists in include dir -- if so we should use this
# instead of the deprecated cl2.hpp header
find_path(OPENCL_HPP_RENAMED_PATH
NAMES CL/opencl.hpp
PATHS
${OPENCL_HPP_INCLUDE_DIR}
)
if (OPENCL_HPP_RENAMED_PATH)
SET(OPENCL_USE_NEW_HEADER TRUE)
else ()
SET(OPENCL_USE_NEW_HEADER FALSE)
endif ()

if (NOT OPENCLHPP_FIND_QUIETLY)
message(STATUS "Found OpenCL C++ headers: ${OPENCL_HPP_INCLUDE_DIR}")
endif ()
@@ -70,6 +70,7 @@
#cmakedefine HAVE_SERVER_PYTHON_PLUGINS

#cmakedefine HAVE_OPENCL
#cmakedefine OPENCL_USE_NEW_HEADER

#cmakedefine ENABLE_MODELTEST

@@ -97,5 +98,7 @@
#define PDAL_VERSION_MINOR "${PDAL_VERSION_MINOR}"
#define PDAL_VERSION_MICRO "${PDAL_VERSION_MICRO}"

#cmakedefine ENABLE_TESTS

#endif

@@ -19,10 +19,17 @@ This page tries to maintain a list with incompatible changes that happened in pr
QGIS 3.20 {#qgis_api_break_3_20}
=========

QgsMapRendererJob {#qgis_api_break_3_20_qgsmaprendererjob}
-----------------

- QgsMapRendererJob::start is no longer virtual. It has been replaced with QgsMapRendererJob::startPrivate. The method QgsMapRendererJob::start checks if the map can be rendered before calling QgsMapRendererJob::startPrivate.
Subclasses have to implement the virtual method startPrivate to start the rendering of the map. For the actual subclasses (QgsMapRendererParallelJob, QgsMapRendererSequentialJob, ...), the start method
is replaced by startPrivate method without change.

setDataSource {#qgis_api_break_3_20_setdatasource}
-------------

- QgsMapLayer::setDataSource is no longer virtual. If has been replaced with QgsMapLayer::setDataSourcePrivate. This is only relevant for subclassing QgsMapLayer, for code that only uses the subclasses (QgsVectorLayer, QgsRasterLayer, ...) this has no effect.
- QgsMapLayer::setDataSource is no longer virtual. It has been replaced with QgsMapLayer::setDataSourcePrivate. This is only relevant for subclassing QgsMapLayer, for code that only uses the subclasses (QgsVectorLayer, QgsRasterLayer, ...) this has no effect.

QGIS 3.4 {#qgis_api_break_3_4}
========
@@ -2,18 +2,25 @@
QgsAbstractMaterialSettings.RenderingTechnique = QgsMaterialSettingsRenderingTechnique
# monkey patching scoped based enum
QgsAbstractMaterialSettings.Triangles = QgsMaterialSettingsRenderingTechnique.Triangles
QgsAbstractMaterialSettings.Triangles.is_monkey_patched = True
QgsAbstractMaterialSettings.Triangles.__doc__ = "Triangle based rendering (default)"
QgsAbstractMaterialSettings.Lines = QgsMaterialSettingsRenderingTechnique.Lines
QgsAbstractMaterialSettings.Lines.is_monkey_patched = True
QgsAbstractMaterialSettings.Lines.__doc__ = "Line based rendering, requires line data"
QgsAbstractMaterialSettings.InstancedPoints = QgsMaterialSettingsRenderingTechnique.InstancedPoints
QgsAbstractMaterialSettings.InstancedPoints.is_monkey_patched = True
QgsAbstractMaterialSettings.InstancedPoints.__doc__ = "Instanced based rendering, requiring triangles and point data"
QgsAbstractMaterialSettings.Points = QgsMaterialSettingsRenderingTechnique.Points
QgsAbstractMaterialSettings.Points.is_monkey_patched = True
QgsAbstractMaterialSettings.Points.__doc__ = "Point based rendering, requires point data"
QgsAbstractMaterialSettings.TrianglesWithFixedTexture = QgsMaterialSettingsRenderingTechnique.TrianglesWithFixedTexture
QgsAbstractMaterialSettings.TrianglesWithFixedTexture.is_monkey_patched = True
QgsAbstractMaterialSettings.TrianglesWithFixedTexture.__doc__ = "Triangle based rendering, using a fixed, non-user-configurable texture (e.g. for terrain rendering)"
QgsAbstractMaterialSettings.TrianglesFromModel = QgsMaterialSettingsRenderingTechnique.TrianglesFromModel
QgsAbstractMaterialSettings.TrianglesFromModel.is_monkey_patched = True
QgsAbstractMaterialSettings.TrianglesFromModel.__doc__ = "Triangle based rendering, using a model object source"
QgsAbstractMaterialSettings.TrianglesDataDefined = QgsMaterialSettingsRenderingTechnique.TrianglesDataDefined
QgsAbstractMaterialSettings.TrianglesDataDefined.is_monkey_patched = True
QgsAbstractMaterialSettings.TrianglesDataDefined.__doc__ = "Triangle based rendering with possibility of datadefined color \since QGIS 3.18"
QgsMaterialSettingsRenderingTechnique.__doc__ = 'Material rendering techniques\n\n.. versionadded:: 3.16\n\n' + '* ``Triangles``: ' + QgsMaterialSettingsRenderingTechnique.Triangles.__doc__ + '\n' + '* ``Lines``: ' + QgsMaterialSettingsRenderingTechnique.Lines.__doc__ + '\n' + '* ``InstancedPoints``: ' + QgsMaterialSettingsRenderingTechnique.InstancedPoints.__doc__ + '\n' + '* ``Points``: ' + QgsMaterialSettingsRenderingTechnique.Points.__doc__ + '\n' + '* ``TrianglesWithFixedTexture``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesWithFixedTexture.__doc__ + '\n' + '* ``TrianglesFromModel``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesFromModel.__doc__ + '\n' + '* ``TrianglesDataDefined``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesDataDefined.__doc__
# --

0 comments on commit 18bbfa9

Please sign in to comment.