Merge pull request #2791 from nirvn/labeling_icons_v2

[ui] add rule-based labeling and obstacle icons
qgis · Feb 17, 2016 · f468f65 · f468f65
2 parents d2679d6 + b4ee36d
commit f468f65
Show file tree

Hide file tree

Showing 5 changed files with 817 additions and 2 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -487,6 +487,9 @@
         <file>themes/default/rendererHeatmapSymbol.svg</file>
         <file>themes/default/renderer25dSymbol.svg</file>
         <file>themes/default/rendererGrassSymbol.svg</file>
+        <file>themes/default/labelingSingle.svg</file>
+        <file>themes/default/labelingRuleBased.svg</file>
+        <file>themes/default/labelingObstacle.svg</file>
         <file>themes/default/repositoryConnected.png</file>
         <file>themes/default/repositoryDisabled.png</file>
         <file>themes/default/repositoryUnavailable.png</file>