palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-09-28 19:31:32 +02:00
Code Issues Projects Releases Wiki Activity

Merged develop into feature

Browse source 
--HG--
branch : feature
This commit is contained in:
Bojan Kverh 2016-10-16 15:03:16 +02:00
parent 8ab094c40d 80c45f8266
commit 128924eb28
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog.txt
View file

@ -42,7 +42,7 @@
- [#138] New tool: 'Mirror Point' or 'Symmetric Point'. - [#138] New tool: 'Mirror Point' or 'Symmetric Point'.
- [#573] New tool: 'Move Point'. - [#573] New tool: 'Move Point'.
# Version 0.4.5 # Version 0.4.5 October 15, 2016
- [#435] Valentina doesn't change the cursor. - [#435] Valentina doesn't change the cursor.
- [#473] Tape 'Preferences' cause loss of focus. - [#473] Tape 'Preferences' cause loss of focus.
- [#485] Error when drawing a curved path. - [#485] Error when drawing a curved path.

3
src/app/tape/tape.pro
View file

@ -201,6 +201,7 @@ unix{
QMAKE_MAC_SDK = macosx QMAKE_MAC_SDK = macosx
# Check which minimal OSX version supports current Qt version # 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) { equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
} else { } else {
@ -211,6 +212,8 @@ unix{
} }
} }
QMAKE_RPATHDIR += @executable_path/../Frameworks
# Path to resources in app bundle # Path to resources in app bundle
#RESOURCES_DIR = "Contents/Resources" defined in translation.pri #RESOURCES_DIR = "Contents/Resources" defined in translation.pri
FRAMEWORKS_DIR = "Contents/Frameworks" FRAMEWORKS_DIR = "Contents/Frameworks"

3
src/app/valentina/valentina.pro
View file

@ -204,6 +204,7 @@ unix{
QMAKE_MAC_SDK = macosx QMAKE_MAC_SDK = macosx
# Check which minimal OSX version supports current Qt version # 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) { equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
} else { } else {
@ -214,6 +215,8 @@ unix{
} }
} }
QMAKE_RPATHDIR += @executable_path/../Frameworks
# Path to resources in app bundle # Path to resources in app bundle
#RESOURCES_DIR = "Contents/Resources" defined in translation.pri #RESOURCES_DIR = "Contents/Resources" defined in translation.pri
FRAMEWORKS_DIR = "Contents/Frameworks" FRAMEWORKS_DIR = "Contents/Frameworks"