Merged develop into feature
--HG-- branch : feature
This commit is contained in:
commit
128924eb28
|
@ -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.
|
||||
|
|
|
@ -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 {
|
||||
|
@ -211,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"
|
||||
|
|
|
@ -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 {
|
||||
|
@ -214,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"
|
||||
|
|
Loading…
Reference in New Issue
Block a user