diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2024-05-01 12:42:59 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-05-02 10:02:41 +0000 |
| commit | ca7056fabdc8386510613212856e483c2e9f3c04 (patch) | |
| tree | cf1572f605d1cc3b2f942f1d3b285d1f8e90a7bd | |
| parent | d9212643038a06171134a78ae03ae032590dc025 (diff) | |
Qt: fix minimum macOS/iOS versions for Qt 6.7.1
Change-Id: I3338a3b6dbb669abab63f94c5ed9e9440a4de04d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/imports/qbs/Probes/qmake-probe.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/Probes/qmake-probe.js b/share/qbs/imports/qbs/Probes/qmake-probe.js index ad0cb3fa7..48b83b873 100644 --- a/share/qbs/imports/qbs/Probes/qmake-probe.js +++ b/share/qbs/imports/qbs/Probes/qmake-probe.js @@ -352,6 +352,13 @@ function getQtProperties(qmakeFilePath) { qtProps.entryPointLibsRelease = fillEntryPointLibs(qtProps, false); } else if (qtProps.mkspecPath.contains("macx")) { if (qtProps.qtMajorVersion >= 5) { + // Since Qt 6.7.1, QMAKE_MACOSX|IOS_DEPLOYMENT_TARGET is no longer present in + // qmake.conf. But it is also present in qconfig.pri, so first try to read it from there + qtProps.macosVersion = configVariable(qconfigContent, "QMAKE_MACOSX_DEPLOYMENT_TARGET"); + qtProps.iosVersion = configVariable(qconfigContent, "QMAKE_IOS_DEPLOYMENT_TARGET"); + + // Next, we override the value from qmake.conf, if present there + // Note, that TVOS/WATCHOS variables are only present in qmake.conf (as of Qt 6.7.1) var lines = getFileContentsRecursively(FileInfo.joinPaths(qtProps.mkspecPath, "qmake.conf")); for (var i = 0; i < lines.length; ++i) { |