From 67a33062e7165638ba283a771246b878734368e8 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sun, 23 Mar 2008 17:46:55 +0000
Subject: status icon plugin: fixed resources conflict

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@294 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/statusicon/CMakeLists.txt         | 2 +-
 src/plugins/General/statusicon/images/images.qrc      | 8 --------
 src/plugins/General/statusicon/images/tray_images.qrc | 8 ++++++++
 src/plugins/General/statusicon/statusicon.pro         | 3 +--
 4 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 src/plugins/General/statusicon/images/images.qrc
 create mode 100644 src/plugins/General/statusicon/images/tray_images.qrc

(limited to 'src/plugins')

diff --git a/src/plugins/General/statusicon/CMakeLists.txt b/src/plugins/General/statusicon/CMakeLists.txt
index d2b28ecba..7f6f6bc3b 100644
--- a/src/plugins/General/statusicon/CMakeLists.txt
+++ b/src/plugins/General/statusicon/CMakeLists.txt
@@ -42,7 +42,7 @@ SET(libstatusicon_MOC_HDRS
 
 #SET(libstatusicon_RCCS translations/translations.qrc)
 
-SET(libstatusicon_RCCS images/images.qrc)
+SET(libstatusicon_RCCS images/tray_images.qrc)
 
 QT4_ADD_RESOURCES(libstatusicon_RCC_SRCS ${libstatusicon_RCCS})
 
diff --git a/src/plugins/General/statusicon/images/images.qrc b/src/plugins/General/statusicon/images/images.qrc
deleted file mode 100644
index b072b1d73..000000000
--- a/src/plugins/General/statusicon/images/images.qrc
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-  <qresource>
-    <file>tray_play.png</file>
-    <file>tray_pause.png</file>
-    <file>tray_stop.png</file>
-  </qresource>
-</RCC>
diff --git a/src/plugins/General/statusicon/images/tray_images.qrc b/src/plugins/General/statusicon/images/tray_images.qrc
new file mode 100644
index 000000000..b072b1d73
--- /dev/null
+++ b/src/plugins/General/statusicon/images/tray_images.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource>
+    <file>tray_play.png</file>
+    <file>tray_pause.png</file>
+    <file>tray_stop.png</file>
+  </qresource>
+</RCC>
diff --git a/src/plugins/General/statusicon/statusicon.pro b/src/plugins/General/statusicon/statusicon.pro
index 01408d1c8..a34a3bd32 100644
--- a/src/plugins/General/statusicon/statusicon.pro
+++ b/src/plugins/General/statusicon/statusicon.pro
@@ -21,9 +21,8 @@ isEmpty(LIB_DIR){
 }
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
-#FORMS += settingsdialog.ui
 
-RESOURCES += images/images.qrc
+RESOURCES += images/tray_images.qrc
 
 
 HEADERS += statusiconfactory.h \
-- 
cgit v1.2.3-13-gbd6f