From 1edc17446207c4bb8c82fc13838d1dceb915bd40 Mon Sep 17 00:00:00 2001 From: Flavio Tordini Date: Mon, 19 Oct 2009 21:38:08 +0200 Subject: [PATCH] Windows icon and fixes --- minitube.ico | Bin 0 -> 67646 bytes minitube.pro | 3 +++ minitube.rc | 2 ++ src/MediaView.cpp | 2 ++ 4 files changed, 7 insertions(+) create mode 100644 minitube.ico create mode 100644 minitube.rc diff --git a/minitube.ico b/minitube.ico new file mode 100644 index 0000000000000000000000000000000000000000..9a3acbe747912c44801fae5653e9e4353e6e4bdd GIT binary patch literal 67646 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 B(Axk2 literal 0 HcmV?d00001 diff --git a/minitube.pro b/minitube.pro index e83f364..c5150fd 100755 --- a/minitube.pro +++ b/minitube.pro @@ -120,3 +120,6 @@ unix { icon128.path = $$DATADIR/icons/hicolor/128x128/apps icon128.files += data/128x128/minitube.png } +win32 { + RC_FILE = minitube.rc +} diff --git a/minitube.rc b/minitube.rc new file mode 100644 index 0000000..2c1795b --- /dev/null +++ b/minitube.rc @@ -0,0 +1,2 @@ +IDI_ICON1 ICON DISCARDABLE "minitube.ico" + diff --git a/src/MediaView.cpp b/src/MediaView.cpp index 08173c5..d5b5ec1 100644 --- a/src/MediaView.cpp +++ b/src/MediaView.cpp @@ -187,10 +187,12 @@ void MediaView::stateChanged(Phonon::State newState, Phonon::State /*oldState*/) // but Phonon on Linux needs a little more help to start playback if (!reallyStopped) mediaObject->play(); +#ifdef Q_WS_MAC // Workaround for Mac playback start problem if (!timerPlayFlag) { workaroundTimer->start(); } +#endif break; -- 2.39.5