Merge pull request #3122 from manisandro/arcgis_rest

Add provider for ArcGIS Map and Feature REST services
qgis · Jun 2, 2016 · 45c0ef0 · 45c0ef0
2 parents 49eaf07 + 1f02d4a
commit 45c0ef0
Show file tree

Hide file tree

Showing 56 changed files with 6,191 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)

diff --git a/images/images.qrc b/images/images.qrc
@@ -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>