diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-03-23 17:46:55 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-03-23 17:46:55 +0000 |
| commit | 67a33062e7165638ba283a771246b878734368e8 (patch) | |
| tree | 3f8c6d6d049d58a18d2db0ce4159299a763dfb13 /src | |
| parent | 2efb8d4561b98d362f32328df5c3a9171502d886 (diff) | |
| download | qmmp-67a33062e7165638ba283a771246b878734368e8.tar.gz qmmp-67a33062e7165638ba283a771246b878734368e8.tar.bz2 qmmp-67a33062e7165638ba283a771246b878734368e8.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/General/statusicon/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/General/statusicon/images/tray_images.qrc (renamed from src/plugins/General/statusicon/images/images.qrc) | 0 | ||||
| -rw-r--r-- | src/plugins/General/statusicon/statusicon.pro | 3 |
3 files changed, 2 insertions, 3 deletions
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/tray_images.qrc index b072b1d73..b072b1d73 100644 --- a/src/plugins/General/statusicon/images/images.qrc +++ b/src/plugins/General/statusicon/images/tray_images.qrc 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 \ |