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

Update minimal requirements for Qt on Mac OS X.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-05-22 19:22:11 +03:00
parent 7b9187894c
commit c6e38932dc
3 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common.pri
View File

@ -25,6 +25,36 @@ win32{
VCOPY = $$QMAKE_COPY /D VCOPY = $$QMAKE_COPY /D
} }
macx{
# 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, 10) {# Qt 5.11
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
} else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 9) {# Qt 5.10
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
} else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 8) {# Qt 5.9
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
} else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 7) {# Qt 5.8
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
} else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {# Qt 5.7
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
} else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) {# Qt 5.4
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
} else {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
}
}
}
}
}
}
}
# See question on StackOwerflow "QSslSocket error when SSL is NOT used" (http://stackoverflow.com/a/31277055/3045403) # See question on StackOwerflow "QSslSocket error when SSL is NOT used" (http://stackoverflow.com/a/31277055/3045403)
# Copy of answer: # Copy of answer:
# We occasionally had customers getting very similar warning messages but the software was also crashing. # We occasionally had customers getting very similar warning messages but the software was also crashing.

16
src/app/tape/tape.pro
View File

@ -216,21 +216,7 @@ unix{
# Some macx stuff # Some macx stuff
QMAKE_MAC_SDK = macosx QMAKE_MAC_SDK = macosx
# Check which minimal OSX version supports current Qt version # QMAKE_MACOSX_DEPLOYMENT_TARGET defined in common.pri
# See page https://doc.qt.io/qt-5/supported-platforms-and-configurations.html
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 7) {# Qt 5.8
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
} else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {# Qt 5.7
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
} else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) {# Qt 5.4
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
} else {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
}
}
}
CONFIG(release, debug|release){ CONFIG(release, debug|release){
QMAKE_RPATHDIR += @executable_path/../Frameworks QMAKE_RPATHDIR += @executable_path/../Frameworks

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

@ -202,21 +202,7 @@ unix{
# Some macx stuff # Some macx stuff
QMAKE_MAC_SDK = macosx QMAKE_MAC_SDK = macosx
# Check which minimal OSX version supports current Qt version # QMAKE_MACOSX_DEPLOYMENT_TARGET defined in common.pri
# See page https://doc.qt.io/qt-5/supported-platforms-and-configurations.html
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 7) {# Qt 5.8
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
} else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {# Qt 5.7
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
} else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) {# Qt 5.4
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
} else {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
}
}
}
CONFIG(release, debug|release){ CONFIG(release, debug|release){
QMAKE_RPATHDIR += @executable_path/../Frameworks QMAKE_RPATHDIR += @executable_path/../Frameworks