From b852b4086367caeb24de8bb61172ebdade8d9bed Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Wed, 5 Jul 2017 19:41:41 +0200 Subject: [PATCH] Take three --- KShare.pro | 7 +++---- icon.rc | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/KShare.pro b/KShare.pro index 1eb36c2..9e63752 100644 --- a/KShare.pro +++ b/KShare.pro @@ -117,16 +117,19 @@ CONFIG += link_pkgconfig PKGCONFIG += libavformat libavcodec libswscale libavutil mac { + ICON = icons/icon.icns SOURCES += $$PWD/platformspecifics/mac/macbackend.cpp HEADERS += $$PWD/platformspecifics/mac/macbackend.hpp LIBS += -framework Carbon warning(Mac is on TODO); } else:win32 { + RC_FILE = myapp.rc SOURCES += $$PWD/platformspecifics/u32/u32backend.cpp HEADERS += $$PWD/platformspecifics/u32/u32backend.hpp LIBS += -luser32 -lkernel32 -lpthread QT += winextras } else:unix { + RC_FILE = myapp.rc SOURCES += $$PWD/platformspecifics/x11/x11backend.cpp HEADERS += $$PWD/platformspecifics/x11/x11backend.hpp QT += x11extras @@ -151,10 +154,6 @@ DISTFILES += \ RESOURCES += \ icon.qrc -RC_FILE = icon.rc - -ICON = icons/icon.ico - # Enable debug symbols QMAKE_CFLAGS_DEBUG += -g diff --git a/icon.rc b/icon.rc index 0ac9804..2e42c32 100644 --- a/icon.rc +++ b/icon.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "icons/icon.icns" +IDI_ICON1 ICON DISCARDABLE "icons/icon.ico"