From 75385854e5973b28d13055d8896cb00380951466 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 3 Aug 2016 16:39:15 +0200 Subject: Clean up Qt logos in player examples Remove unused images and resource files. Add new logo .ico files. Task-number: QTBUG-55137 Change-Id: I75148b1965fee4bbd7157c5fdb89d04666b2c89d Reviewed-by: Alessandro Portale --- examples/winextras/musicplayer/images/musicplayer.ico | Bin 31371 -> 0 bytes examples/winextras/musicplayer/images/musicplayer.png | Bin 9186 -> 0 bytes examples/winextras/musicplayer/images/qt-logo.ico | Bin 0 -> 96079 bytes examples/winextras/musicplayer/main.cpp | 1 - examples/winextras/musicplayer/musicplayer.pro | 5 +---- examples/winextras/musicplayer/musicplayer.qrc | 5 ----- examples/winextras/musicplayer/musicplayer.rc | 1 - examples/winextras/quickplayer/images/qt-logo.ico | Bin 0 -> 96079 bytes examples/winextras/quickplayer/images/quickplayer.ico | Bin 31371 -> 0 bytes examples/winextras/quickplayer/images/quickplayer.png | Bin 9186 -> 0 bytes examples/winextras/quickplayer/quickplayer.pro | 2 +- examples/winextras/quickplayer/quickplayer.qrc | 1 - 12 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 examples/winextras/musicplayer/images/musicplayer.ico delete mode 100644 examples/winextras/musicplayer/images/musicplayer.png create mode 100644 examples/winextras/musicplayer/images/qt-logo.ico delete mode 100644 examples/winextras/musicplayer/musicplayer.qrc delete mode 100644 examples/winextras/musicplayer/musicplayer.rc create mode 100644 examples/winextras/quickplayer/images/qt-logo.ico delete mode 100644 examples/winextras/quickplayer/images/quickplayer.ico delete mode 100644 examples/winextras/quickplayer/images/quickplayer.png (limited to 'examples') diff --git a/examples/winextras/musicplayer/images/musicplayer.ico b/examples/winextras/musicplayer/images/musicplayer.ico deleted file mode 100644 index fef1dee..0000000 Binary files a/examples/winextras/musicplayer/images/musicplayer.ico and /dev/null differ diff --git a/examples/winextras/musicplayer/images/musicplayer.png b/examples/winextras/musicplayer/images/musicplayer.png deleted file mode 100644 index ecbff0c..0000000 Binary files a/examples/winextras/musicplayer/images/musicplayer.png and /dev/null differ diff --git a/examples/winextras/musicplayer/images/qt-logo.ico b/examples/winextras/musicplayer/images/qt-logo.ico new file mode 100644 index 0000000..b5ac59b Binary files /dev/null and b/examples/winextras/musicplayer/images/qt-logo.ico differ diff --git a/examples/winextras/musicplayer/main.cpp b/examples/winextras/musicplayer/main.cpp index 5cace0d..fed8be7 100644 --- a/examples/winextras/musicplayer/main.cpp +++ b/examples/winextras/musicplayer/main.cpp @@ -76,7 +76,6 @@ int main(int argc, char *argv[]) app.setOrganizationName("QtWinExtras"); app.setOrganizationDomain("qt-project.org"); app.setApplicationDisplayName("QtWinExtras Music Player"); - app.setWindowIcon(QIcon(":/logo.png")); associateFileTypes(QStringList(".mp3")); diff --git a/examples/winextras/musicplayer/musicplayer.pro b/examples/winextras/musicplayer/musicplayer.pro index 73968cf..ae8f4eb 100644 --- a/examples/winextras/musicplayer/musicplayer.pro +++ b/examples/winextras/musicplayer/musicplayer.pro @@ -12,10 +12,7 @@ SOURCES = \ musicplayer.cpp \ volumebutton.cpp -RESOURCES += \ - musicplayer.qrc - -RC_ICONS = images/musicplayer.ico +RC_ICONS = images/qt-logo.ico target.path = $$[QT_INSTALL_EXAMPLES]/winextras/musicplayer INSTALLS += target diff --git a/examples/winextras/musicplayer/musicplayer.qrc b/examples/winextras/musicplayer/musicplayer.qrc deleted file mode 100644 index b1a0029..0000000 --- a/examples/winextras/musicplayer/musicplayer.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - images/musicplayer.png - - diff --git a/examples/winextras/musicplayer/musicplayer.rc b/examples/winextras/musicplayer/musicplayer.rc deleted file mode 100644 index 00a51ee..0000000 --- a/examples/winextras/musicplayer/musicplayer.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "images\\musicplayer.ico" diff --git a/examples/winextras/quickplayer/images/qt-logo.ico b/examples/winextras/quickplayer/images/qt-logo.ico new file mode 100644 index 0000000..b5ac59b Binary files /dev/null and b/examples/winextras/quickplayer/images/qt-logo.ico differ diff --git a/examples/winextras/quickplayer/images/quickplayer.ico b/examples/winextras/quickplayer/images/quickplayer.ico deleted file mode 100644 index fef1dee..0000000 Binary files a/examples/winextras/quickplayer/images/quickplayer.ico and /dev/null differ diff --git a/examples/winextras/quickplayer/images/quickplayer.png b/examples/winextras/quickplayer/images/quickplayer.png deleted file mode 100644 index ecbff0c..0000000 Binary files a/examples/winextras/quickplayer/images/quickplayer.png and /dev/null differ diff --git a/examples/winextras/quickplayer/quickplayer.pro b/examples/winextras/quickplayer/quickplayer.pro index f7474f7..77f9c97 100644 --- a/examples/winextras/quickplayer/quickplayer.pro +++ b/examples/winextras/quickplayer/quickplayer.pro @@ -12,7 +12,7 @@ OTHER_FILES += \ RESOURCES += \ quickplayer.qrc -RC_ICONS = images/quickplayer.ico +RC_ICONS = images/qt-logo.ico target.path = $$[QT_INSTALL_EXAMPLES]/winextras/quickplayer INSTALLS += target diff --git a/examples/winextras/quickplayer/quickplayer.qrc b/examples/winextras/quickplayer/quickplayer.qrc index 7515bd2..e046252 100644 --- a/examples/winextras/quickplayer/quickplayer.qrc +++ b/examples/winextras/quickplayer/quickplayer.qrc @@ -8,6 +8,5 @@ images/media-seek-backward-32.png images/media-seek-forward-32.png images/media-stop-32.png - images/quickplayer.png -- cgit v1.2.3