From 235bcc4bc6a24e5e0b79359e76ef28fb5b77f62b Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Tue, 15 Dec 2015 22:19:53 +0100
Subject: Prefix resources to avoid clashes

Change-Id: Ia166a0acd1cfae92ba096a687a574f3645fc6f5c
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
---
 src/imports/controls/BusyIndicator.qml        | 6 +++---
 src/imports/controls/CheckBox.qml             | 2 +-
 src/imports/controls/ComboBox.qml             | 2 +-
 src/imports/controls/Dial.qml                 | 2 +-
 src/imports/controls/ItemDelegate.qml         | 2 +-
 src/imports/controls/MenuItem.qml             | 2 +-
 src/imports/controls/qtlabscontrolsplugin.qrc | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml
index 3e7191c2..2d898566 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/BusyIndicator.qml
@@ -60,9 +60,9 @@ T.BusyIndicator {
             y: (parent.height - height) / 2
             width: Math.min(parent.width, parent.height)
             height: width
-            source: width <= 32 ? "qrc:/images/spinner_small.png" :
-                    width >= 48 ? "qrc:/images/spinner_large.png" :
-                                  "qrc:/images/spinner_medium.png"
+            source: width <= 32 ? "qrc:/qt-project.org/imports/Qt/labs/controls/images/spinner_small.png" :
+                    width >= 48 ? "qrc:/qt-project.org/imports/Qt/labs/controls/images/spinner_large.png" :
+                                  "qrc:/qt-project.org/imports/Qt/labs/controls/images/spinner_medium.png"
 
             RotationAnimator on rotation {
                 duration: 800
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index 8bc3cc9e..b7d67fe6 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -66,7 +66,7 @@ T.CheckBox {
         Image {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
-            source: "qrc:/images/check.png"
+            source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/check.png"
             visible: control.checked
         }
     }
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 3d4e5ed5..e06372e7 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -91,7 +91,7 @@ T.ComboBox {
         Image {
             x: parent.width - width - control.rightPadding
             y: (parent.height - height) / 2
-            source: "qrc:/images/drop-indicator.png"
+            source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/drop-indicator.png"
         }
     }
     //! [background]
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index 951d33ec..9068464f 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -65,7 +65,7 @@ T.Dial {
         y: background.height / 2 - handle.height / 2
         width: 14
         height: 10
-        source: "qrc:/images/dial-indicator.png"
+        source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/dial-indicator.png"
         antialiasing: true
         transform: [
             Translate {
diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml
index 7cfb622a..f8060432 100644
--- a/src/imports/controls/ItemDelegate.qml
+++ b/src/imports/controls/ItemDelegate.qml
@@ -74,7 +74,7 @@ T.ItemDelegate {
         y: control.topPadding + (control.availableHeight - height) / 2
 
         visible: control.checked
-        source: control.checkable ? "qrc:/images/check.png" : ""
+        source: control.checkable ? "qrc:/qt-project.org/imports/Qt/labs/controls/images/check.png" : ""
     }
     //! [indicator]
 
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml
index 9e290063..4785f050 100644
--- a/src/imports/controls/MenuItem.qml
+++ b/src/imports/controls/MenuItem.qml
@@ -71,7 +71,7 @@ T.MenuItem {
         y: control.topPadding + (control.availableHeight - height) / 2
 
         visible: control.checked
-        source: control.checkable ? "qrc:/images/check.png" : ""
+        source: control.checkable ? "qrc:/qt-project.org/imports/Qt/labs/controls/images/check.png" : ""
     }
     //! [indicator]
 
diff --git a/src/imports/controls/qtlabscontrolsplugin.qrc b/src/imports/controls/qtlabscontrolsplugin.qrc
index bebbe570..cb7bc994 100644
--- a/src/imports/controls/qtlabscontrolsplugin.qrc
+++ b/src/imports/controls/qtlabscontrolsplugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/qt-project.org/imports/Qt/labs/controls">
         <file>images/spinner_small.png</file>
         <file>images/spinner_medium.png</file>
         <file>images/spinner_large.png</file>
-- 
cgit v1.2.3