fix after rebase

qgis · Jul 13, 2021 · 42389a7 · 42389a7
1 parent d40aa5d
commit 42389a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -922,6 +922,7 @@
         <file>themes/default/mIconFolderHomeParams.svg</file>
         <file>themes/default/mActionMeasureBearing.svg</file>
         <file>themes/default/mActionMeshDigitizing.svg</file>
+        <file>themes/default/mActionNewMeshLayer.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -17,7 +17,7 @@
      <x>0</x>
      <y>0</y>
      <width>1064</width>
-     <height>22</height>
+     <height>24</height>
     </rect>
    </property>
    <property name="toolTip">
@@ -3573,22 +3573,7 @@ Shows placeholders for labels which could not be placed, e.g. due to overlaps wi
     <string>New Mesh Layer</string>
    </property>
   </action>
-  <action name="mActionEditMesh">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionMeshEditTool.svg</normaloff>:/images/themes/default/mActionMeshEditTool.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Edit Mesh</string>
-   </property>
-  </action>
  </widget>
  <resources/>
- <resources>
-  <include location="../../images/images.qrc"/>
- </resources>
  <connections/>
 </ui>