aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We have been running Tape in two different cases.

Browse Source 
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.
(grafted from 911feb13c2c0d9b632fcdb35770d74d5a551d9c0)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-01-15 18:02:14 +02:00
parent 7982e48e4e
commit c661e04cb3
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/tape/mapplication.cpp
View File

@ -223,9 +223,10 @@ MApplication::MApplication(int &argc, char **argv)
setOrganizationDomain(VER_COMPANYDOMAIN_STR); setOrganizationDomain(VER_COMPANYDOMAIN_STR);
// Setting the Application version // Setting the Application version
setApplicationVersion(APP_VERSION_STR); 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")); setWindowIcon(QIcon(":/tapeicon/64x64/logo.png"));
#endif // !defined(Q_OS_MAC)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

7
src/app/valentina/valentina.pro
View File

@ -289,8 +289,9 @@ unix{
templates.path = $$RESOURCES_DIR/tables/templates/ templates.path = $$RESOURCES_DIR/tables/templates/
templates.files = $$INSTALL_STANDARD_TEMPLATES templates.files = $$INSTALL_STANDARD_TEMPLATES
format.path = $$RESOURCES_DIR/ icns_resources.path = $$RESOURCES_DIR/
format.files = $$PWD/../../../dist/macx/measurements.icns icns_resources.files += $$PWD/../../../dist/macx/measurements.icns
icns_resources.files += $$PWD/../../../dist/Tape.icns
QMAKE_BUNDLE_DATA += \ QMAKE_BUNDLE_DATA += \
templates \ templates \
@ -298,7 +299,7 @@ unix{
libraries \ libraries \
tape \ tape \
xpdf \ xpdf \
format icns_resources
} }
} }