From 67d20696a7e00198cfd78cff97b3bd6a3b76df18 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 16 Oct 2016 12:47:47 +0300 Subject: [PATCH 1/3] Fixed Mac OS X deployment target. (grafted from 8bd98d7d0a42ca97d7608b084b5f2ddbf228117e) --HG-- branch : develop --- src/app/tape/tape.pro | 1 + src/app/valentina/valentina.pro | 1 + 2 files changed, 2 insertions(+) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index f12b0dfc9..4a9d5d74d 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -201,6 +201,7 @@ unix{ QMAKE_MAC_SDK = macosx # Check which minimal OSX version supports current Qt version + # See page https://doc.qt.io/qt-5/supported-platforms-and-configurations.html equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 } else { diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index faff1b32a..b50aed793 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -204,6 +204,7 @@ unix{ QMAKE_MAC_SDK = macosx # Check which minimal OSX version supports current Qt version + # See page https://doc.qt.io/qt-5/supported-platforms-and-configurations.html equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 } else { From 4a326d3b6b616dd65e5656deeb00e191d5c17ade Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 16 Oct 2016 12:48:06 +0300 Subject: [PATCH 2/3] Allow MAC OS X to find library inside a bundle. (grafted from 483fd5c402708b828382a691e0f21305b2b2b9df) --HG-- branch : develop --- src/app/tape/tape.pro | 2 ++ src/app/valentina/valentina.pro | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 4a9d5d74d..83ca0388d 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -212,6 +212,8 @@ unix{ } } + QMAKE_RPATHDIR += @executable_path/../Frameworks + # Path to resources in app bundle #RESOURCES_DIR = "Contents/Resources" defined in translation.pri FRAMEWORKS_DIR = "Contents/Frameworks" diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index b50aed793..af55048c5 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -215,6 +215,8 @@ unix{ } } + QMAKE_RPATHDIR += @executable_path/../Frameworks + # Path to resources in app bundle #RESOURCES_DIR = "Contents/Resources" defined in translation.pri FRAMEWORKS_DIR = "Contents/Frameworks" From 80c45f826684a95fe0f2523b25b90f1d29e287b2 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 16 Oct 2016 15:00:32 +0300 Subject: [PATCH 3/3] Updated ChangeLog.txt. Added new release date. (grafted from 36b202e04c2696c9e8a58e13bc293ce458f5db30) --HG-- branch : develop --- ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 845ad5487..ae8a2f9be 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -42,7 +42,7 @@ - [#138] New tool: 'Mirror Point' or 'Symmetric Point'. - [#573] New tool: 'Move Point'. -# Version 0.4.5 +# Version 0.4.5 October 15, 2016 - [#435] Valentina doesn't change the cursor. - [#473] Tape 'Preferences' cause loss of focus. - [#485] Error when drawing a curved path.