Merge 2.2 into master

Change-Id: Ibd6fef8ad780af22bd39e583ca36f8994fb6510c

6 files changed, 29 insertions, 6 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6f0e10448..ae91640d9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -170,7 +170,7 @@ jobs:
       run: |
         qbs setup-toolchains --detect
         qbs setup-qt --detect
-        qbs config profiles.qt.baseProfile xcode-macosx-x86_64
+        qbs config profiles.qt.baseProfile xcode_13_2_1-macosx-x86_64
         qbs config defaultProfile qt
         qbs config --list
     - name: Print ccache stats
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6b63097f6..e89f79b21 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -104,7 +104,7 @@ jobs:
       run: |
         qbs setup-toolchains --detect
         qbs setup-qt --detect
-        qbs config profiles.qt.baseProfile xcode_11_7-macosx-x86_64
+        qbs config profiles.qt.baseProfile xcode_13_2_1-macosx-x86_64
         qbs config defaultProfile qt
         qbs config --list
     - name: Print ccache stats
diff --git a/VERSION b/VERSION
index ccbccc3dc..276cbf9e2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.0
+2.3.0
diff --git a/changelogs/changes-2.2.0.md b/changelogs/changes-2.2.0.md
index c8c4c998c..ffa867f0a 100644
--- a/changelogs/changes-2.2.0.md
+++ b/changelogs/changes-2.2.0.md
@@ -1,6 +1,7 @@
 # General
 * Improved speed of project resolving by employing multiple CPU cores, if available.
 * Improved speed of probes execution on macOS.
+* Object and array (var and varList) properties are now immutable in Probe items.
 
 # Language
 * Modules can now contain `Parameters` items.
@@ -8,13 +9,22 @@
 
 # C/C++ support
 * Allow `"mold"` as value for `cpp.linkerVariant`.
+* The systemIncludePaths property is now handled correctly for clang-cl.
+
+# Apple support
+* Updated dmgbuild tool. This fixes bug that additional licenses are not shown in
+  the combobox in the resulting DMG image.
 
 # Qt support
 * Only create qbs modules for those Qt modules that products actually need.
 * Users can now opt out of using RPATH when linking on Linux.
 
-# Protocol Buffers Support (Protobuf Module)
-* This module now requires pkg-config.
+# Other
+* Protobuf module now requires pkg-config or built-in runtime.
+* Protobuf module now requires C++17 on all platforms.
+* Capnproto module: the outputDir property is now mutable.
+* Added support for Groups to the VisualStudio generator.
+* pkgconfig module provider: mergeDependencies property is deprecated.
 
 # Contributors
 * Christian Kandeler
diff --git a/changelogs/changes-2.2.1.md b/changelogs/changes-2.2.1.md
new file mode 100644
index 000000000..323da791a
--- /dev/null
+++ b/changelogs/changes-2.2.1.md
@@ -0,0 +1,12 @@
+# Language
+* Fixed JavaScript Date() constructor on Windows (QBS-1768).
+
+# C/C++ support
+* Worked around crash in cl.exe when retrieving built-in defines (QBS-1743).
+
+# CI
+* Fixed building release packages.
+
+# Contributors
+* Christian Kandeler
+* Ivan Komissarov
diff --git a/src/shared/quickjs/quickjs.c b/src/shared/quickjs/quickjs.c
index 61b9816e7..1e3b97d51 100644
--- a/src/shared/quickjs/quickjs.c
+++ b/src/shared/quickjs/quickjs.c
@@ -42103,6 +42103,7 @@ static JSValue js___date_now(JSContext *ctx, JSValueConst this_val,
 #endif
 
 /* OS dependent: return the UTC time in microseconds since 1970. */
+// FIXME: Unused, remove?
 static JSValue js___date_clock(JSContext *ctx, JSValueConst this_val,
                                int argc, JSValueConst *argv)
 {
@@ -48332,7 +48333,7 @@ static int64_t date_now(void) {
     GetSystemTime(&st);
     int64_t d;
     SystemTimeToFileTime(&st, (FILETIME *) &d);
-    return d /= 10000;
+    return (d - 116444736000000000ULL) / 10000;
 #else
     struct timeval tv;
     gettimeofday(&tv, NULL);