From b42710f8d008d31c7ee3f8ca8b41cd64759ababc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 10:11:36 +0200 Subject: [PATCH] Measurement Diagram is not shown on Mac OS X. (grafted from 34490ebbc73d0f9c0360883903cd010fb6bea8f8) --HG-- branch : develop --- src/app/tape/tape.pro | 2 +- src/app/valentina/valentina.pro | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index a0dfb7f3d..d91843c06 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -231,7 +231,7 @@ unix{ # Copy to bundle standard measurements files # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually. - forceCopyToDestdir($${OUT_PWD}/$${DESTDIR}/diagrams.rcc, $$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) + QMAKE_POST_LINK += $$VCOPY $$quote($${OUT_PWD}/$${DESTDIR}/diagrams.rcc) $$quote($$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) $$escape_expand(\\n\\t) format.path = $$RESOURCES_DIR/ format.files += $$PWD/../../../dist/macx/i-measurements.icns diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index a7ce989f4..7fd1bf6a7 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -294,6 +294,10 @@ unix{ icns_resources.files += $$PWD/../../../dist/macx/s-measurements.icns icns_resources.files += $$PWD/../../../dist/macx/pattern.icns + # Copy to bundle standard measurements files + # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually. + QMAKE_POST_LINK += $$VCOPY $$quote($${OUT_PWD}/../tape/$${DESTDIR}/tape.app/$$RESOURCES_DIR/diagrams.rcc) $$quote($$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) $$escape_expand(\\n\\t) + QMAKE_BUNDLE_DATA += \ templates \ standard \