Merge branch '2.3' into master

Change-Id: Idca4efc5d0b44ceab159a8a287e125c85b57ae29

8 files changed, 26 insertions, 13 deletions

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 248baf5f7..d820a03aa 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -27,10 +27,10 @@ jobs:
       WITH_TESTS: 0
     steps:
     - uses: actions/checkout@v1
-    - name: Pull the Focal Image
-      run: docker-compose pull focal
+    - name: Pull the Docker Image
+      run: docker-compose pull jammy
     - name: Build Qbs Docs
-      run: docker-compose run focal ${{ matrix.config.script }}
+      run: docker-compose run jammy ${{ matrix.config.script }}
     - name: Upload artifacts
       uses: 'actions/upload-artifact@v2'
       with:
diff --git a/changelogs/changes-2.3.1.md b/changelogs/changes-2.3.1.md
index 598c6748f..6c4b6c0ad 100644
--- a/changelogs/changes-2.3.1.md
+++ b/changelogs/changes-2.3.1.md
@@ -4,8 +4,13 @@
 # Apple support
 * Fixed codesing module when multiplexing over build variants (QBS-1775).
 
+# Qt support
+* Fixed retrieving minimum macOS/iOS versions for Qt 6.7.1.
+
 # CI
 * Fixed release jobs.
+* Fixed macOS 14.2 job.
+* Updated GitHub actions to recent versions to avoid warnings.
 
 # Contributors
 * Christian Kandeler
diff --git a/doc/reference/items/probe/pkgconfig-probe.qdoc b/doc/reference/items/probe/pkgconfig-probe.qdoc
index 22fd510ac..66e008601 100644
--- a/doc/reference/items/probe/pkgconfig-probe.qdoc
+++ b/doc/reference/items/probe/pkgconfig-probe.qdoc
@@ -51,8 +51,12 @@
             maxVersion: '5.99.99'
         }
         files: 'main.cpp'
-        cpp.cxxFlags: pkgConfig.cflags
-        cpp.linkerFlags: pkgConfig.libs
+        cpp.defines : pkgConfig.defines
+        cpp.includePaths: pkgConfig.includePaths
+        cpp.dynamicLibraries: pkgConfig.libraries
+        cpp.libraryPaths: pkgConfig.libraryPaths
+        cpp.commonCompilerFlags: pkgConfig.compilerFlags
+        cpp.linkerFlags: pkgConfig.linkerFlags
     }
     \endcode
 */
@@ -194,9 +198,6 @@
     This output property contains the list of library paths that should be passed to a linker when
     using requested package.
 
-    This property sets the value of the PKG_CONFIG_LIBDIR environment variable passed to
-    the \c pkg-config binary.
-
     \nodefaultvalue
 */
 
diff --git a/examples/grpc/grpc.qbs b/examples/grpc/grpc.qbs
index 370bcb292..b6d169508 100644
--- a/examples/grpc/grpc.qbs
+++ b/examples/grpc/grpc.qbs
@@ -41,7 +41,7 @@ Project {
         protobuf.cpp.useGrpc: true
         consoleApplication: true
         cpp.cxxLanguageVersion: "c++17"
-        cpp.minimumMacosVersion: "10.8"
+        cpp.minimumMacosVersion: "10.15"
         name: "client"
         files: "client.cpp"
         Properties {
@@ -61,7 +61,7 @@ Project {
         protobuf.cpp.useGrpc: true
         consoleApplication: true
         cpp.cxxLanguageVersion: "c++17"
-        cpp.minimumMacosVersion: "10.8"
+        cpp.minimumMacosVersion: "10.15"
         name: "server"
         files: "server.cpp"
         Properties {
diff --git a/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs
index 95fb1c1e3..5a3b27652 100644
--- a/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs
+++ b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs
@@ -5,7 +5,7 @@ CppApplication {
     condition: protobuf.cpp.present && qbs.targetPlatform === Host.platform()
 
     Depends { name: "cpp" }
-    cpp.minimumMacosVersion: "10.8"
+    cpp.minimumMacosVersion: "10.15"
 
     Depends { name: "protobuf.cpp"; required: false }
 
diff --git a/share/qbs/imports/qbs/Probes/qmake-probe.js b/share/qbs/imports/qbs/Probes/qmake-probe.js
index 6ddbd48ba..746914e20 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) {
diff --git a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs
index 4b004a884..e36ae47ca 100644
--- a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs
+++ b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs
@@ -12,7 +12,7 @@ CppApplication {
 
     Depends { name: "cpp" }
     cpp.cxxLanguageVersion: "c++17"
-    cpp.minimumMacosVersion: "10.8"
+    cpp.minimumMacosVersion: "10.15"
     cpp.warningLevel: "none"
 
     Depends { name: "protobuf.cpp"; required: false }
diff --git a/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs b/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs
index 2db71fd03..959552ea5 100644
--- a/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs
+++ b/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs
@@ -11,7 +11,7 @@ CppApplication {
     consoleApplication: true
 
     Depends { name: "cpp" }
-    cpp.minimumMacosVersion: "10.8"
+    cpp.minimumMacosVersion: "10.15"
 
     Depends { name: "protobuf.cpp"; required: false }
     property bool hasProtobuf: {