Merge pull request Quick-Box#958 from MartinKT/fix-resources-paths

fixed paths in resources
arnost00 · Feb 12, 2024 · 6fd103c · 6fd103c
2 parents 22c8d58 + 4d853e1
commit 6fd103c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/libqf/libqfqmlwidgets/src/framework/logwidget.ui b/libqf/libqfqmlwidgets/src/framework/logwidget.ui
@@ -74,7 +74,7 @@
         <string>Clear</string>
        </property>
        <property name="icon">
-        <iconset resource="../../images/flat/flat.qrc">
+        <iconset resource="../../images/flat/qfqmlwidgets_flat.qrc">
          <normaloff>:/qf/qmlwidgets/images/flat/delete.svg</normaloff>:/qf/qmlwidgets/images/flat/delete.svg</iconset>
        </property>
        <property name="autoRaise">
@@ -102,7 +102,7 @@
         <string>Resize columns to fit content</string>
        </property>
        <property name="icon">
-        <iconset resource="../../images/flat/flat.qrc">
+        <iconset resource="../../images/flat/qfqmlwidgets_flat.qrc">
          <normaloff>:/qf/qmlwidgets/images/flat/zoom_fitwidth.svg</normaloff>:/qf/qmlwidgets/images/flat/zoom_fitwidth.svg</iconset>
        </property>
        <property name="autoRaise">
@@ -119,7 +119,7 @@
         <string>...</string>
        </property>
        <property name="icon">
-        <iconset resource="../../images/flat/flat.qrc">
+        <iconset resource="../../images/flat/qfqmlwidgets_flat.qrc">
          <normaloff>:/qf/qmlwidgets/images/flat/settings.svg</normaloff>:/qf/qmlwidgets/images/flat/settings.svg</iconset>
        </property>
        <property name="popupMode">
@@ -159,7 +159,7 @@
  </customwidgets>
  <resources>
   <include location="../../images/images.qrc"/>
-  <include location="../../images/flat/flat.qrc"/>
+  <include location="../../images/flat/qfqmlwidgets_flat.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.ui b/quickevent/app/quickevent/plugins/Event/src/services/servicewidget.ui
@@ -62,15 +62,15 @@
    <item>
     <widget class="QPushButton" name="btPlay">
      <property name="icon">
-      <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+      <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
        <normaloff>:/qf/qmlwidgets/images/flat/media-play.svg</normaloff>:/qf/qmlwidgets/images/flat/media-play.svg</iconset>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QPushButton" name="btShowDetail">
      <property name="icon">
-      <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+      <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
        <normaloff>:/qf/qmlwidgets/images/flat/settings.svg</normaloff>:/qf/qmlwidgets/images/flat/settings.svg</iconset>
      </property>
     </widget>
@@ -79,7 +79,7 @@
  </widget>
  <resources>
   <include location="../../../../../../libqf/libqfcore/images/images.qrc"/>
-  <include location="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc"/>
+  <include location="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/quickevent/app/quickevent/plugins/Relays/src/relaywidget.ui b/quickevent/app/quickevent/plugins/Relays/src/relaywidget.ui
@@ -179,7 +179,7 @@
          <string>Add leg Ctrl+Ins</string>
         </property>
         <property name="icon">
-         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
           <normaloff>:/qf/qmlwidgets/images/flat/insert-row.svg</normaloff>:/qf/qmlwidgets/images/flat/insert-row.svg</iconset>
         </property>
         <property name="shortcut">
@@ -193,7 +193,7 @@
          <string>Remove leg Ctrl+Del</string>
         </property>
         <property name="icon">
-         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
           <normaloff>:/qf/qmlwidgets/images/flat/delete-row.svg</normaloff>:/qf/qmlwidgets/images/flat/delete-row.svg</iconset>
         </property>
         <property name="shortcut">
@@ -207,7 +207,7 @@
          <string>Move leg down Ctrl+D</string>
         </property>
         <property name="icon">
-         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
           <normaloff>:/qf/qmlwidgets/images/flat/down.svg</normaloff>:/qf/qmlwidgets/images/flat/down.svg</iconset>
         </property>
         <property name="shortcut">
@@ -221,7 +221,7 @@
          <string>Move leg up Ctrl+U</string>
         </property>
         <property name="icon">
-         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
           <normaloff>:/qf/qmlwidgets/images/flat/up.svg</normaloff>:/qf/qmlwidgets/images/flat/up.svg</iconset>
         </property>
         <property name="shortcut">
@@ -235,7 +235,7 @@
          <string>Reload Ctrl+R</string>
         </property>
         <property name="icon">
-         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
           <normaloff>:/qf/qmlwidgets/images/flat/reload.svg</normaloff>:/qf/qmlwidgets/images/flat/reload.svg</iconset>
         </property>
         <property name="shortcut">
@@ -287,7 +287,7 @@
   <tabstop>tblLegs</tabstop>
  </tabstops>
  <resources>
-  <include location="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc"/>
+  <include location="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/quickevent/app/quickevent/plugins/Runs/src/eventstatisticswidget.ui b/quickevent/app/quickevent/plugins/Runs/src/eventstatisticswidget.ui
@@ -73,7 +73,7 @@
          <string>Print results in selected rows</string>
         </property>
         <property name="icon">
-         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
           <normaloff>:/qf/qmlwidgets/images/flat/printer.svg</normaloff>:/qf/qmlwidgets/images/flat/printer.svg</iconset>
         </property>
         <property name="autoRaise">
@@ -87,7 +87,7 @@
          <string>Clear new results in selected rows</string>
         </property>
         <property name="icon">
-         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
           <normaloff>:/qf/qmlwidgets/images/flat/delete.svg</normaloff>:/qf/qmlwidgets/images/flat/delete.svg</iconset>
         </property>
         <property name="autoRaise">
@@ -101,7 +101,7 @@
          <string>Reload table</string>
         </property>
         <property name="icon">
-         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
           <normaloff>:/qf/qmlwidgets/images/flat/reload.svg</normaloff>:/qf/qmlwidgets/images/flat/reload.svg</iconset>
         </property>
         <property name="autoRaise">
@@ -115,7 +115,7 @@
          <string>Options</string>
         </property>
         <property name="icon">
-         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
+         <iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
           <normaloff>:/qf/qmlwidgets/images/flat/settings.svg</normaloff>:/qf/qmlwidgets/images/flat/settings.svg</iconset>
         </property>
         <property name="autoRaise">
@@ -159,7 +159,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc"/>
+  <include location="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc"/>
   <include location="../Runs.qrc"/>
  </resources>
  <connections/>