Skip to content

Commit

Permalink
Remove icon with bad sRGB profile (causing Qt warnings)
Browse files Browse the repository at this point in the history
(cherry-picked from 2a2bf2c)
  • Loading branch information
nyalldawson committed Sep 26, 2016
1 parent 4026560 commit efebbce
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions src/plugins/interpolation/interpolator.qrc
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,5 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/">
<file>options.png</file>
<file>raster-interpolate.png</file> <file>raster-interpolate.png</file>
</qresource> </qresource>
</RCC> </RCC>
Binary file removed src/plugins/interpolation/options.png
Binary file not shown.
6 changes: 3 additions & 3 deletions src/plugins/interpolation/qgsinterpolationdialogbase.ui
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>772</width> <width>858</width>
<height>382</height> <height>389</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
Expand Down Expand Up @@ -147,7 +147,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="interpolator.qrc"> <iconset resource="interpolator.qrc">
<normaloff>:/options.png</normaloff>:/options.png</iconset> <normaloff>:/mActionOptions.svg</normaloff>:/mActionOptions.svg</iconset>
</property> </property>
</widget> </widget>
</item> </item>
Expand Down
6 changes: 3 additions & 3 deletions src/ui/qgsunitselectionwidget.ui
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../plugins/interpolation/interpolator.qrc"> <iconset resource="../../images/images.qrc">
<normaloff>:/options.png</normaloff>:/options.png</iconset> <normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../plugins/interpolation/interpolator.qrc"/> <include location="../../images/images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

0 comments on commit efebbce

Please sign in to comment.