From e1413254daf2f61ea194e79f3daac1276424737f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 13 Jul 2014 19:20:20 +0100 Subject: [PATCH] [whatsnew] Move icon to main resources --- .../whatsnew_0_8/data => data}/images/whatsnew.png | Bin resources.qrc | 1 + src/viewpages/whatsnew_0_8/WhatsNew_0_8.h | 2 +- src/viewpages/whatsnew_0_8/resources.qrc | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) rename {src/viewpages/whatsnew_0_8/data => data}/images/whatsnew.png (100%) diff --git a/src/viewpages/whatsnew_0_8/data/images/whatsnew.png b/data/images/whatsnew.png similarity index 100% rename from src/viewpages/whatsnew_0_8/data/images/whatsnew.png rename to data/images/whatsnew.png diff --git a/resources.qrc b/resources.qrc index 12c87028c..372c5a0cf 100644 --- a/resources.qrc +++ b/resources.qrc @@ -194,5 +194,6 @@ data/www/index.html data/images/beatsmusic.svg data/images/ipv6-logo.svg + data/images/whatsnew.png diff --git a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h index 761a2ba8c..8e2b4f9e8 100644 --- a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h +++ b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h @@ -87,7 +87,7 @@ public: const QString defaultName() { return WHATSNEW_0_8_VIEWPAGE_NAME; } QString title() const { return tr( "What's new in 0.8?" ); } QString description() const { return tr( "An overview of the changes and additions since 0.7." ); } - const QString pixmapPath() const { return ( ":/whatsnew_0_8/data/images/whatsnew.png" ); } + const QString pixmapPath() const { return ( RESPATH "images/whatsnew.png" ); } bool isDeletable() const { return true; } int sortValue() { return 1; } diff --git a/src/viewpages/whatsnew_0_8/resources.qrc b/src/viewpages/whatsnew_0_8/resources.qrc index 1f14da7f2..9a342e5ea 100644 --- a/src/viewpages/whatsnew_0_8/resources.qrc +++ b/src/viewpages/whatsnew_0_8/resources.qrc @@ -11,6 +11,5 @@ data/images/design-screenshot.png data/images/android.png data/images/tomahawk-android.png - data/images/whatsnew.png