Showing with 3,750 additions and 1,663 deletions.
  1. +1 −1 CMakeLists.txt
  2. +448 −0 ChangeLog
  3. +0 −2 ci/travis/linux/before_install.sh
  4. +0 −1 ci/travis/linux/install.sh
  5. +8 −2 debian/changelog
  6. +151 −75 images/svg/shopping/shopping_diy.svg
  7. +76 −41 images/svg/shopping/shopping_estateagent.svg
  8. +58 −29 images/svg/shopping/shopping_estateagent2.svg
  9. +122 −97 images/svg/shopping/shopping_gift.svg
  10. +78 −65 images/svg/shopping/shopping_hairdresser.svg
  11. +82 −81 images/svg/shopping/shopping_hifi.svg
  12. +87 −42 images/svg/shopping/shopping_jewelry.svg
  13. +82 −83 images/svg/shopping/shopping_mobile_phone.svg
  14. +127 −107 images/svg/shopping/shopping_music.svg
  15. +77 −75 images/svg/shopping/shopping_pet.svg
  16. +137 −183 images/svg/shopping/shopping_pet2.svg
  17. +95 −68 images/svg/shopping/shopping_photo.svg
  18. +52 −43 images/svg/shopping/shopping_supermarket.svg
  19. +82 −86 images/svg/shopping/shopping_tackle.svg
  20. +81 −65 images/svg/shopping/shopping_video_rental.svg
  21. +6 −2 ms-windows/osgeo4w/package-nightly.cmd
  22. +7 −2 ms-windows/osgeo4w/package.cmd
  23. +6 −4 python/core/symbology-ng/qgsfillsymbollayerv2.sip
  24. +1 −1 python/core/symbology-ng/qgslinesymbollayerv2.sip
  25. +5 −0 python/core/symbology-ng/qgssymbolv2.sip
  26. +0 −4 python/plugins/db_manager/db_plugins/oracle/TODO.md
  27. +1 −1 python/plugins/db_manager/dlg_sql_window.py
  28. +19 −19 python/plugins/fTools/tools/doGeoprocessing.py
  29. +2 −2 python/plugins/processing/algs/qgis/Clip.py
  30. +2 −2 python/plugins/processing/algs/qgis/Intersection.py
  31. +19 −19 python/plugins/processing/algs/qgis/Union.py
  32. +98 −93 scripts/generate_test_mask_image.py
  33. +1 −1 scripts/tsstat.pl
  34. +16 −1 src/app/nodetool/qgsmaptoolnodetool.cpp
  35. +6 −12 src/app/qgsfieldcalculator.cpp
  36. +3 −2 src/app/qgsprojectproperties.cpp
  37. +2 −2 src/core/auth/qgsauthcertutils.h
  38. +4 −0 src/core/auth/qgsauthmanager.cpp
  39. +7 −1 src/core/geometry/qgscircularstringv2.cpp
  40. +6 −0 src/core/geometry/qgscurvepolygonv2.cpp
  41. +2 −2 src/core/geometry/qgsgeometryutils.cpp
  42. +11 −11 src/core/geometry/qgsgeos.cpp
  43. +22 −2 src/core/geometry/qgslinestringv2.cpp
  44. +6 −7 src/core/geometry/qgsmultipointv2.cpp
  45. +11 −5 src/core/geometry/qgspointv2.cpp
  46. +2 −2 src/core/geometry/qgspointv2.h
  47. +3 −3 src/core/layertree/qgslayertreegroup.cpp
  48. +26 −15 src/core/pal/labelposition.cpp
  49. +2 −2 src/core/pal/pointset.cpp
  50. +1 −1 src/core/qgsexpression.cpp
  51. +1 −0 src/core/qgsmaplayer.cpp
  52. +5 −6 src/core/qgsmaptopixelgeometrysimplifier.cpp
  53. +2 −5 src/core/qgsvectorfilewriter.cpp
  54. +9 −10 src/core/qgsvectorlayer.cpp
  55. +7 −0 src/core/qgsvectorlayereditutils.cpp
  56. +11 −0 src/core/qgsvectorlayerfeatureiterator.cpp
  57. +21 −19 src/core/qgsvectorlayerrenderer.cpp
  58. +9 −8 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  59. +2 −3 src/core/symbology-ng/qgsellipsesymbollayerv2.h
  60. +17 −10 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  61. +2 −1 src/core/symbology-ng/qgsfillsymbollayerv2.h
  62. +22 −1 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  63. +8 −3 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  64. +10 −5 src/core/symbology-ng/qgssymbollayerv2.cpp
  65. +5 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  66. +10 −0 src/core/symbology-ng/qgssymbolv2.cpp
  67. +5 −0 src/core/symbology-ng/qgssymbolv2.h
  68. +3 −3 src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.cpp
  69. +1 −1 src/gui/editorwidgets/qgsrelationreferencewidget.cpp
  70. +28 −3 src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
  71. +13 −4 src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.h
  72. +39 −3 src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.cpp
  73. +10 −20 src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.h
  74. +2 −0 src/plugins/geometry_checker/CMakeLists.txt
  75. +2 −0 src/plugins/geometry_checker/checks/qgsgeometrycheck.h
  76. +64 −0 src/plugins/geometry_checker/qgsgeometrycheckerplugin.cpp
  77. +2 −64 src/plugins/geometry_checker/qgsgeometrycheckerplugin.h
  78. +1 −0 src/plugins/geometry_snapper/CMakeLists.txt
  79. +64 −0 src/plugins/geometry_snapper/qgsgeometrysnapperplugin.cpp
  80. +2 −65 src/plugins/geometry_snapper/qgsgeometrysnapperplugin.h
  81. +8 −3 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  82. +5 −0 src/providers/grass/qgis.r.in.cpp
  83. +1 −1 src/providers/grass/qgis.v.in.cpp
  84. +10 −0 src/providers/grass/qgsgrassimport.cpp
  85. +26 −9 src/providers/grass/qgsgrassvectormaplayer.cpp
  86. +1 −1 src/providers/postgres/qgspostgresexpressioncompiler.cpp
  87. +28 −6 src/providers/postgres/qgspostgresprovider.cpp
  88. +21 −6 src/providers/spatialite/qgsspatialitefeatureiterator.cpp
  89. +5 −0 src/providers/wms/qgswmscapabilities.cpp
  90. +12 −9 src/server/qgswfsserver.cpp
  91. +13 −3 src/server/qgswmsconfigparser.cpp
  92. +1 −0 src/server/qgswmsprojectparser.cpp
  93. +3 −0 tests/src/core/CMakeLists.txt
  94. +3 −3 tests/src/core/testqgsauthmanager.cpp
  95. +100 −8 tests/src/core/testqgsexpression.cpp
  96. +47 −0 tests/src/core/testqgsgeometry.cpp
  97. +185 −0 tests/src/core/testqgslinefillsymbol.cpp
  98. +154 −0 tests/src/core/testqgsmarkerlinesymbol.cpp
  99. +185 −0 tests/src/core/testqgspointpatternfillsymbol.cpp
  100. +4 −1 tests/src/providers/grass/testqgsgrassprovider.cpp
  101. +16 −2 tests/src/python/test_qgsdelimitedtextprovider.py
  102. +83 −0 tests/src/python/test_qgsdelimitedtextprovider_wanted.py
  103. +5 −1 tests/src/python/test_qgsgeometry.py
  104. +24 −11 tests/src/python/test_qgsvectorlayer.py
  105. BIN ...estdata/control_images/expected_rulebased_disabled_else/expected_rulebased_disabled_else_mask.png
  106. BIN tests/testdata/control_images/expected_rulebased_else/expected_rulebased_else_mask.png
  107. BIN ...rol_images/maprotation/expected_lines-parallel-label+45/expected_lines-parallel-label+45_mask.png
  108. BIN tests/testdata/control_images/markerlinesymbol/expected_line_offset/expected_line_offset.png
  109. BIN tests/testdata/control_images/markerlinesymbol/expected_line_offset/expected_line_offset_mask.png
  110. BIN .../control_images/symbol_linefill/expected_datadefined_subsymbol/expected_datadefined_subsymbol.png
  111. BIN ...rol_images/symbol_linefill/expected_datadefined_subsymbol/expected_datadefined_subsymbol_mask.png
  112. BIN tests/testdata/control_images/symbol_linefill/expected_symbol_linefill/expected_symbol_linefill.png
  113. BIN ...estdata/control_images/symbol_linefill/expected_symbol_linefill/expected_symbol_linefill_mask.png
  114. BIN ..._images/symbol_pointpatternfill/expected_datadefined_subsymbol/expected_datadefined_subsymbol.png
  115. BIN ...es/symbol_pointpatternfill/expected_datadefined_subsymbol/expected_datadefined_subsymbol_mask.png
  116. BIN ...ta/control_images/symbol_pointpatternfill/expected_symbol_pointfill/expected_symbol_pointfill.png
  117. +5 −0 tests/testdata/delimitedtext/test13749.csv
  118. +3 −0 tests/testdata/geom_data.csv
  119. +284 −0 tests/testdata/marker_line_offset.qml
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "12")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(CPACK_PACKAGE_VERSION_PATCH "1")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Lyon")
IF (POLICY CMP0048) # in CMake 3.0.0+
Expand Down
Loading