From 0420f91c122bbbebfb5e070562d76dc2006ccb61 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 24 Sep 2010 14:55:32 +0200
Subject: [PATCH] Fix resource paths in ui files of QmlJsEditor
---
.../contextpanewidgetborderimage.ui | 14 +++++++-------
.../qmleditorwidgets/contextpanewidgetimage.ui | 14 +++++++-------
.../qmleditorwidgets/contextpanewidgetrectangle.ui | 12 ++++++------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
index 9f58484fe0d..595b7d442e6 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
@@ -152,7 +152,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/horizontal-scale-icon.png</normaloff>:/qmldesigner/images/horizontal-scale-icon.png</iconset>
</property>
<property name="iconSize">
@@ -172,7 +172,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/tile-icon-hor-crop.png</normaloff>:/qmldesigner/images/tile-icon-hor-crop.png</iconset>
</property>
<property name="iconSize">
@@ -192,7 +192,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/tile-icon-hor - scale.png</normaloff>:/qmldesigner/images/tile-icon-hor - scale.png</iconset>
</property>
<property name="iconSize">
@@ -224,7 +224,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/tile-icon-vert-crop.png</normaloff>:/qmldesigner/images/tile-icon-vert-crop.png</iconset>
</property>
<property name="iconSize">
@@ -244,7 +244,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/vertical-scale-icon.png</normaloff>:/qmldesigner/images/vertical-scale-icon.png</iconset>
</property>
<property name="iconSize">
@@ -264,7 +264,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/tile-icon-vert-scale.png</normaloff>:/qmldesigner/images/tile-icon-vert-scale.png</iconset>
</property>
<property name="iconSize">
@@ -304,7 +304,7 @@
</customwidget>
</customwidgets>
<resources>
- <include location="../resources/resources.qrc"/>
+ <include location="resources.qrc"/>
</resources>
<connections/>
</ui>
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetimage.ui
index d58780d80ac..dc0587de5b6 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.ui
@@ -63,7 +63,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/scale-icon.png</normaloff>:/qmldesigner/images/scale-icon.png</iconset>
</property>
<property name="iconSize">
@@ -83,7 +83,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/horizontal-scale-icon.png</normaloff>:/qmldesigner/images/horizontal-scale-icon.png</iconset>
</property>
<property name="iconSize">
@@ -103,7 +103,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/vertical-scale-icon.png</normaloff>:/qmldesigner/images/vertical-scale-icon.png</iconset>
</property>
<property name="iconSize">
@@ -123,7 +123,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/tile-icon.png</normaloff>:/qmldesigner/images/tile-icon.png</iconset>
</property>
<property name="iconSize">
@@ -143,7 +143,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/aspect-fit-icon.png</normaloff>:/qmldesigner/images/aspect-fit-icon.png</iconset>
</property>
<property name="iconSize">
@@ -163,7 +163,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/aspect-crop-icon.png</normaloff>:/qmldesigner/images/aspect-crop-icon.png</iconset>
</property>
<property name="iconSize">
@@ -289,7 +289,7 @@
</customwidget>
</customwidgets>
<resources>
- <include location="../resources/resources.qrc"/>
+ <include location="resources.qrc"/>
</resources>
<connections/>
</ui>
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui
index 2b32e1588dd..43e2c735f7e 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui
@@ -123,7 +123,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/icon_color_solid.png</normaloff>:/qmldesigner/images/icon_color_solid.png</iconset>
</property>
<property name="checkable">
@@ -146,7 +146,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/icon_color_gradient.png</normaloff>:/qmldesigner/images/icon_color_gradient.png</iconset>
</property>
<property name="checkable">
@@ -169,7 +169,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/icon_color_none.png</normaloff>:/qmldesigner/images/icon_color_none.png</iconset>
</property>
<property name="checkable">
@@ -255,7 +255,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/icon_color_solid.png</normaloff>:/qmldesigner/images/icon_color_solid.png</iconset>
</property>
<property name="checkable">
@@ -278,7 +278,7 @@
<string/>
</property>
<property name="icon">
- <iconset resource="../resources/resources.qrc">
+ <iconset resource="resources.qrc">
<normaloff>:/qmldesigner/images/icon_color_none.png</normaloff>:/qmldesigner/images/icon_color_none.png</iconset>
</property>
<property name="checkable">
@@ -308,7 +308,7 @@
</customwidget>
</customwidgets>
<resources>
- <include location="../resources/resources.qrc"/>
+ <include location="resources.qrc"/>
</resources>
<connections/>
</ui>
--
GitLab