From 2e81dbcc50e510afc9033be9a99bfcb2512f6fd9 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Fri, 12 Feb 2021 09:33:08 +1000
Subject: [PATCH] Fix add/remove buttons have no icons in create relationship
 dialogs

---
 src/ui/qgsrelationmanageradddialogbase.ui          | 12 +++++++-----
 .../qgsrelationmanageraddpolymorphicdialogbase.ui  | 14 ++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/ui/qgsrelationmanageradddialogbase.ui b/src/ui/qgsrelationmanageradddialogbase.ui
index 40adcf35217e..a8dbb42f30e9 100644
--- a/src/ui/qgsrelationmanageradddialogbase.ui
+++ b/src/ui/qgsrelationmanageradddialogbase.ui
@@ -101,8 +101,8 @@
         <string>Add new field pair as part of a composite foreign key</string>
        </property>
        <property name="icon">
-        <iconset theme="add">
-         <normaloff>../../../../../../.designer/backup</normaloff>../../../../../../.designer/backup</iconset>
+        <iconset resource="../../images/images.qrc">
+         <normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
        </property>
       </widget>
      </item>
@@ -112,8 +112,8 @@
         <string>Remove the select or last pair of fields</string>
        </property>
        <property name="icon">
-        <iconset theme="remove">
-         <normaloff>../../../../../../.designer/backup</normaloff>../../../../../../.designer/backup</iconset>
+        <iconset resource="../../images/images.qrc">
+         <normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
        </property>
       </widget>
      </item>
@@ -134,6 +134,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../images/images.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/src/ui/qgsrelationmanageraddpolymorphicdialogbase.ui b/src/ui/qgsrelationmanageraddpolymorphicdialogbase.ui
index dc5da19a6074..773c5a3af496 100644
--- a/src/ui/qgsrelationmanageraddpolymorphicdialogbase.ui
+++ b/src/ui/qgsrelationmanageraddpolymorphicdialogbase.ui
@@ -70,8 +70,8 @@
         <string>Add new field pair as part of a composite foreign key</string>
        </property>
        <property name="icon">
-        <iconset theme="add">
-         <normaloff>../../../../../../.designer/backup</normaloff>../../../../../../.designer/backup</iconset>
+        <iconset resource="../../images/images.qrc">
+         <normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
        </property>
       </widget>
      </item>
@@ -81,8 +81,8 @@
         <string>Remove the select or last pair of fields</string>
        </property>
        <property name="icon">
-        <iconset theme="remove">
-         <normaloff>../../../../../../.designer/backup</normaloff>../../../../../../.designer/backup</iconset>
+        <iconset resource="../../images/images.qrc">
+         <normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
        </property>
       </widget>
      </item>
@@ -155,7 +155,7 @@
     </widget>
    </item>
    <item row="3" column="1" colspan="2">
-    <widget class="QgsFieldExpressionWidget" name="mReferencedLayerExpressionWidget"/>
+    <widget class="QgsFieldExpressionWidget" name="mReferencedLayerExpressionWidget" native="true"/>
    </item>
    <item row="6" column="0">
     <widget class="QLabel" name="mRelationStrengthLabel">
@@ -191,6 +191,8 @@
    <header>qgsmaplayercombobox.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../images/images.qrc"/>
+ </resources>
  <connections/>
 </ui>