Skip to content

Commit 45c0ef0

Browse files
manisandromanisandro
committedJun 2, 2016
Merge pull request #3122 from manisandro/arcgis_rest
Add provider for ArcGIS Map and Feature REST services
·
ltr-3_40archive/master_2
2 parents 49eaf07 + 1f02d4a commit 45c0ef0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+6191
-22
lines changed
 

‎CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ FIND_PACKAGE(GDAL)
200200
FIND_PACKAGE(Expat REQUIRED)
201201
FIND_PACKAGE(Spatialindex REQUIRED)
202202
FIND_PACKAGE(Qwt REQUIRED)
203+
FIND_PACKAGE(QJSON)
203204

204205
IF (WITH_INTERNAL_QEXTSERIALPORT)
205206
SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport)

‎images/images.qrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,10 @@
589589
<file>themes/default/styleicons/paletted.svg</file>
590590
<file>themes/default/styleicons/singlebandgray.svg</file>
591591
<file>themes/default/styleicons/singlebandpseudocolor.svg</file>
592+
<file>themes/default/mIconAfs.svg</file>
593+
<file>themes/default/mIconAms.svg</file>
594+
<file>themes/default/mActionAddAmsLayer.svg</file>
595+
<file>themes/default/mActionAddAfsLayer.svg</file>
592596
</qresource>
593597
<qresource prefix="/images/tips">
594598
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

0 commit comments

Comments
 (0)
Please sign in to comment.