From 77dcb78e80006cd69251dfd1b8f363e73c54c342 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 15 Jan 2016 07:36:55 -0800 Subject: [PATCH] We have been running Tape in two different cases. The first inside own bundle where info.plist is works fine, but the second, when we run inside Valentina's bundle, require direct setting the icon. --HG-- branch : release --- src/app/tape/mapplication.cpp | 5 +++-- src/app/valentina/valentina.pro | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp index cb53cbbc9..f2acf0066 100644 --- a/src/app/tape/mapplication.cpp +++ b/src/app/tape/mapplication.cpp @@ -223,9 +223,10 @@ MApplication::MApplication(int &argc, char **argv) setOrganizationDomain(VER_COMPANYDOMAIN_STR); // Setting the Application version setApplicationVersion(APP_VERSION_STR); -#if !defined(Q_OS_MAC) + // We have been running Tape in two different cases. + // The first inside own bundle where info.plist is works fine, but the second, + // when we run inside Valentina's bundle, require direct setting the icon. setWindowIcon(QIcon(":/tapeicon/64x64/logo.png")); -#endif // !defined(Q_OS_MAC) } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index aa8700e03..aa32758a2 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -289,8 +289,9 @@ unix{ templates.path = $$RESOURCES_DIR/tables/templates/ templates.files = $$INSTALL_STANDARD_TEMPLATES - format.path = $$RESOURCES_DIR/ - format.files = $$PWD/../../../dist/macx/measurements.icns + icns_resources.path = $$RESOURCES_DIR/ + icns_resources.files += $$PWD/../../../dist/macx/measurements.icns + icns_resources.files += $$PWD/../../../dist/Tape.icns QMAKE_BUNDLE_DATA += \ templates \ @@ -298,7 +299,7 @@ unix{ libraries \ tape \ xpdf \ - format + icns_resources } }