Merge 1.24 into master

Change-Id: I2414c0eaf431386e3d529d03fff19f2a589a2aa4

4 files changed, 15 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4129bc911..94dbe6f2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,9 @@ find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Script QUIET)
 if (Qt6_FOUND)
     find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core5Compat REQUIRED)
     if(NOT TARGET Qt6Core5Compat)
-        set_property(TARGET Qt6::Core5Compat PROPERTY IMPORTED_GLOBAL TRUE) # hack for CMake < 1.18
+        if(CMAKE_VERSION VERSION_LESS 3.18)
+            set_property(TARGET Qt6::Core5Compat PROPERTY IMPORTED_GLOBAL TRUE) # hack for CMake < 3.18
+        endif()
         add_library(Qt6Core5Compat ALIAS Qt6::Core5Compat)
     endif()
 else()
diff --git a/VERSION b/VERSION
index 53cc1a6f9..f9e8384bb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.24.0
+1.24.1
diff --git a/changelogs/changes-1.24.1.md b/changelogs/changes-1.24.1.md
new file mode 100644
index 000000000..acbf25fa3
--- /dev/null
+++ b/changelogs/changes-1.24.1.md
@@ -0,0 +1,9 @@
+# C/C++ Support
+Fix macros and include paths retrieval for IAR
+
+# Build System
+Add fix for cmake >= 3.18
+
+# Contributors
+* Denis Shienkov
+* Eike Ziller
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js
index d5f019cbc..ed58ac262 100644
--- a/share/qbs/modules/cpp/iar.js
+++ b/share/qbs/modules/cpp/iar.js
@@ -450,6 +450,7 @@ function dumpMacros(compilerFilePath, tag) {
         args.push(cppLanguageOption(compilerFilePath));
 
     var p = new Process();
+    p.setWorkingDirectory(tempDir.path());
     p.exec(compilerFilePath, args, true);
     var outFile = new TextFile(outFilePath, TextFile.ReadOnly);
     return Cpp.extractMacros(outFile.readAll());
@@ -471,6 +472,7 @@ function dumpCompilerIncludePaths(compilerFilePath, tag) {
 
     var includePaths = [];
     var p = new Process();
+    p.setWorkingDirectory(tempDir.path());
     // It is possible that the process can return an error code in case the
     // compiler does not support the `--IDE3` flag. So, don't throw an error in this case.
     p.exec(compilerFilePath, args, false);