Skip to content
Permalink
Browse files

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

  • Loading branch information
rouault committed Jun 2, 2016
2 parents 3351f55 + 94077b2 commit edace8d0e634efb5fef05180d98aa007bcabf9f2
Showing with 7,866 additions and 366 deletions.
  1. +1 −0 CMakeLists.txt
  2. +2 −1 debian/changelog
  3. +1 −0 debian/control.in
  4. +2 −0 debian/qgis-providers.install.in
  5. +5 −3 debian/rules
  6. +4 −0 images/images.qrc
  7. +520 −0 images/themes/default/mActionAddAfsLayer.svg
  8. +542 −0 images/themes/default/mActionAddAmsLayer.svg
  9. +480 −0 images/themes/default/mIconAfs.svg
  10. +503 −0 images/themes/default/mIconAms.svg
  11. +2 −0 ms-windows/osgeo4w/package.cmd
  12. +3 −0 python/core/geometry/qgswkbtypes.sip
  13. +6 −1 python/core/qgsowsconnection.sip
  14. +3 −3 python/core/qgsvectordataprovider.sip
  15. +14 −5 python/core/raster/qgsrasterdataprovider.sip
  16. +1 −1 python/gui/editorwidgets/qgsrelationreferencewidgetwrapper.sip
  17. +2 −0 python/gui/gui.sip
  18. +10 −0 python/gui/qgisinterface.sip
  19. +84 −0 python/gui/qgsmapstylepanel.sip
  20. +43 −0 python/gui/qgssourceselectdialog.sip
  21. +15 −6 python/plugins/processing/algs/lidar/LidarToolsAlgorithmProvider.py
  22. +32 −6 python/plugins/processing/algs/lidar/lastools/LAStoolsAlgorithm.py
  23. +5 −2 python/plugins/processing/algs/lidar/lastools/las2lasPro_filter.py
  24. +5 −2 python/plugins/processing/algs/lidar/lastools/las2lasPro_project.py
  25. +5 −2 python/plugins/processing/algs/lidar/lastools/las2lasPro_transform.py
  26. +5 −2 python/plugins/processing/algs/lidar/lastools/las2las_filter.py
  27. +5 −2 python/plugins/processing/algs/lidar/lastools/las2las_project.py
  28. +5 −2 python/plugins/processing/algs/lidar/lastools/las2las_transform.py
  29. +5 −2 python/plugins/processing/algs/lidar/lastools/las2txt.py
  30. +5 −2 python/plugins/processing/algs/lidar/lastools/las2txtPro.py
  31. +5 −3 python/plugins/processing/algs/lidar/lastools/lasboundary.py
  32. +5 −3 python/plugins/processing/algs/lidar/lastools/lasboundaryPro.py
  33. +5 −1 python/plugins/processing/algs/lidar/lastools/lasclassify.py
  34. +5 −1 python/plugins/processing/algs/lidar/lastools/lasclassifyPro.py
  35. +41 −34 python/plugins/processing/algs/lidar/lastools/lascontrol.py
  36. +75 −0 python/plugins/processing/algs/lidar/lastools/lasdiff.py
  37. +8 −1 python/plugins/processing/algs/lidar/lastools/lasground.py
  38. +101 −0 python/plugins/processing/algs/lidar/lastools/lasgroundPro_new.py
  39. +95 −0 python/plugins/processing/algs/lidar/lastools/lasground_new.py
  40. +7 −3 python/plugins/processing/algs/lidar/lastools/lasheight.py
  41. +8 −3 python/plugins/processing/algs/lidar/lastools/lasheightPro.py
  42. +122 −0 python/plugins/processing/algs/lidar/lastools/lasheightPro_classify.py
  43. +116 −0 python/plugins/processing/algs/lidar/lastools/lasheight_classify.py
  44. +5 −2 python/plugins/processing/algs/lidar/lastools/lasindex.py
  45. +5 −2 python/plugins/processing/algs/lidar/lastools/lasindexPro.py
  46. +5 −2 python/plugins/processing/algs/lidar/lastools/lasinfo.py
  47. +5 −2 python/plugins/processing/algs/lidar/lastools/lasinfoPro.py
  48. +5 −2 python/plugins/processing/algs/lidar/lastools/lasmerge.py
  49. +4 −1 python/plugins/processing/algs/lidar/lastools/lasmergePro.py
  50. +5 −1 python/plugins/processing/algs/lidar/lastools/lasnoise.py
  51. +5 −1 python/plugins/processing/algs/lidar/lastools/lasnoisePro.py
  52. +122 −0 python/plugins/processing/algs/lidar/lastools/laspublish.py
  53. +122 −0 python/plugins/processing/algs/lidar/lastools/laspublishPro.py
  54. +11 −2 python/plugins/processing/algs/lidar/lastools/lasthin.py
  55. +12 −3 python/plugins/processing/algs/lidar/lastools/lasthinPro.py
  56. +12 −9 python/plugins/processing/algs/lidar/lastools/lastile.py
  57. +9 −4 python/plugins/processing/algs/lidar/lastools/lastilePro.py
  58. +4 −1 python/plugins/processing/algs/lidar/lastools/laszip.py
  59. +4 −1 python/plugins/processing/algs/lidar/lastools/laszipPro.py
  60. +5 −2 python/plugins/processing/algs/lidar/lastools/txt2las.py
  61. +5 −2 python/plugins/processing/algs/lidar/lastools/txt2lasPro.py
  62. +1 −2 python/plugins/processing/gui/ProcessingToolbox.py
  63. +1 −4 src/app/main.cpp
  64. +135 −1 src/app/qgisapp.cpp
  65. +18 −0 src/app/qgisapp.h
  66. +12 −0 src/app/qgisappinterface.cpp
  67. +10 −0 src/app/qgisappinterface.h
  68. +14 −2 src/app/qgsfieldsproperties.cpp
  69. +125 −115 src/app/qgsmapstylingwidget.cpp
  70. +6 −1 src/app/qgsmapstylingwidget.h
  71. +1 −1 src/core/composer/qgslegendmodel.cpp
  72. +11 −0 src/core/geometry/qgswkbtypes.h
  73. +1 −1 src/core/qgsmaplayerlegend.cpp
  74. +1 −1 src/core/qgsowsconnection.cpp
  75. +6 −1 src/core/qgsowsconnection.h
  76. +1 −1 src/core/qgsvectordataprovider.h
  77. +1 −1 src/core/raster/qgsrasterdataprovider.cpp
  78. +14 −5 src/core/raster/qgsrasterdataprovider.h
  79. +4 −2 src/gui/CMakeLists.txt
  80. +11 −0 src/gui/qgisinterface.h
  81. +6 −0 src/gui/qgsmaplayercombobox.cpp
  82. +17 −0 src/gui/qgsmapstylepanel.cpp
  83. +92 −0 src/gui/qgsmapstylepanel.h
  84. +487 −0 src/gui/qgssourceselectdialog.cpp
  85. +104 −0 src/gui/qgssourceselectdialog.h
  86. +1 −1 src/plugins/globe/featuresource/qgsglobefeaturesource.h
  87. +15 −2 src/plugins/globe/qgsglobeplugindialog.cpp
  88. +18 −6 src/plugins/globe/qgsglobeplugindialog.ui
  89. +4 −4 src/plugins/globe/qgsglobetilesource.h
  90. +4 −0 src/plugins/globe/qgsglobevectorlayerproperties.cpp
  91. +3 −0 src/providers/CMakeLists.txt
  92. +75 −0 src/providers/arcgisrest/CMakeLists.txt
  93. +155 −0 src/providers/arcgisrest/qgsafsdataitems.cpp
  94. +61 −0 src/providers/arcgisrest/qgsafsdataitems.h
  95. +105 −0 src/providers/arcgisrest/qgsafsfeatureiterator.cpp
  96. +57 −0 src/providers/arcgisrest/qgsafsfeatureiterator.h
  97. +253 −0 src/providers/arcgisrest/qgsafsprovider.cpp
  98. +86 −0 src/providers/arcgisrest/qgsafsprovider.h
  99. +102 −0 src/providers/arcgisrest/qgsafsproviderextern.cpp
  100. +141 −0 src/providers/arcgisrest/qgsafssourceselect.cpp
  101. +42 −0 src/providers/arcgisrest/qgsafssourceselect.h
  102. +152 −0 src/providers/arcgisrest/qgsamsdataitems.cpp
  103. +63 −0 src/providers/arcgisrest/qgsamsdataitems.h
  104. +450 −0 src/providers/arcgisrest/qgsamsprovider.cpp
  105. +106 −0 src/providers/arcgisrest/qgsamsprovider.h
  106. +103 −0 src/providers/arcgisrest/qgsamsproviderextern.cpp
  107. +99 −0 src/providers/arcgisrest/qgsamssourceselect.cpp
  108. +41 −0 src/providers/arcgisrest/qgsamssourceselect.h
  109. +591 −0 src/providers/arcgisrest/qgsarcgisrestutils.cpp
  110. +81 −0 src/providers/arcgisrest/qgsarcgisrestutils.h
  111. +1 −1 src/providers/gdal/qgsgdalprovider.cpp
  112. +1 −1 src/providers/gdal/qgsgdalprovider.h
  113. +1 −1 src/providers/grass/qgsgrassrasterprovider.cpp
  114. +1 −1 src/providers/grass/qgsgrassrasterprovider.h
  115. +107 −10 src/providers/oracle/qgsoracleprovider.cpp
  116. +36 −31 src/providers/oracle/qgsoracleprovider.h
  117. +1 −1 src/providers/wcs/qgswcsprovider.cpp
  118. +1 −1 src/providers/wcs/qgswcsprovider.h
  119. +1 −1 src/providers/wms/qgswmsprovider.cpp
  120. +4 −1 src/providers/wms/qgswmsprovider.h
  121. +26 −0 src/ui/qgisapp.ui
  122. +45 −38 src/ui/qgsmapstylingwidgetbase.ui
  123. +259 −0 src/ui/qgssourceselectdialogbase.ui
  124. +242 −0 tests/src/python/test_qgsgeometry.py
@@ -200,6 +200,7 @@ FIND_PACKAGE(GDAL)
FIND_PACKAGE(Expat REQUIRED)
FIND_PACKAGE(Spatialindex REQUIRED)
FIND_PACKAGE(Qwt REQUIRED)
FIND_PACKAGE(QJSON)

IF (WITH_INTERNAL_QEXTSERIALPORT)
SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport)
@@ -6,6 +6,7 @@ qgis (2.15.0) UNRELEASED; urgency=medium
* refine GSL build dependency
* limit python-future to stretch, sid, wily and xenial
* include qgis.qch in qgis-api-doc
* include argis rest provider

[ Matthias Kuhn ]
* Add dependency to python-future
@@ -14,7 +15,7 @@ qgis (2.15.0) UNRELEASED; urgency=medium
* Fix removal of obsolete diversions for bother the grass plugin & provider.
(closes: #817176)

-- Jürgen E. Fischer <jef@norbit.de> Thu, 24 Mar 2016 09:53:20 +0100
-- Jürgen E. Fischer <jef@norbit.de> Thu, 02 Jun 2016 16:08:54 +0200

qgis (2.14.0) unstable; urgency=medium

@@ -31,6 +31,7 @@ Build-Depends:
#wheezy jessie precise trusty utopic vivid wily# libqtwebkit-dev,
#stretch jessie wheezy# libqwt-dev,
#precise trusty wily xenial sid# libqwt5-qt4-dev,
#sid stretch jessie wheezy trusty wily xenial# libqjson-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
@@ -17,4 +17,6 @@ usr/lib/qgis/plugins/libvirtuallayerprovider.so
usr/lib/qgis/plugins/libwcsprovider.so
usr/lib/qgis/plugins/libwfsprovider.so
usr/lib/qgis/plugins/libwmsprovider.so
#sid stretch jessie wheezy trusty wily xenial#usr/lib/qgis/plugins/libarcgismapserverprovider.so
#sid stretch jessie wheezy trusty wily xenial#usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
{QT_PLUGIN_DIR}/sqldrivers/libqsqlspatialite.so
@@ -121,9 +121,11 @@ ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
CMAKE_OPTS += \
-DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so \
-DWITH_QTWEBKIT=FALSE
CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid stretch xenial"))
CMAKE_OPTS += -DWITH_QTWEBKIT=FALSE
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid"))
@@ -589,6 +589,10 @@
<file>themes/default/styleicons/paletted.svg</file>
<file>themes/default/styleicons/singlebandgray.svg</file>
<file>themes/default/styleicons/singlebandpseudocolor.svg</file>
<file>themes/default/mIconAfs.svg</file>
<file>themes/default/mIconAms.svg</file>
<file>themes/default/mActionAddAmsLayer.svg</file>
<file>themes/default/mActionAddAfsLayer.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

0 comments on commit edace8d

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