Merge branch '2.0' into master

Change-Id: I0322637bf5e81873da34f36e108611b163076e5f

9 files changed, 51 insertions, 27 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dacf54a9e..8e466d909 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -750,15 +750,15 @@ jobs:
             target: 'desktop',
             toolchain: 'win64_msvc2019_64',
             testProfile: 'MSVC2022-x64',
-            qtVersion: '5.15.2',
+            qtVersion: '6.5.0',
             script: './scripts/test-qbs.sh',
           }
         - {
-            name: 'Run Windows tests (MSVC 2022, Qt 6.0.2)',
+            name: 'Run Windows tests (MSVC 2022, Qt 5.15)',
             target: 'desktop',
             toolchain: 'win64_msvc2019_64',
             testProfile: 'MSVC2022-x64',
-            qtVersion: '6.0.2',
+            qtVersion: '5.15.2',
             script: './scripts/test-qt.sh',
           }
         - {
@@ -766,15 +766,15 @@ jobs:
             target: 'desktop',
             toolchain: 'win64_msvc2019_64',
             testProfile: 'clang-cl-x86_64',
-            qtVersion: '5.15.2',
+            qtVersion: '6.5.0',
             script: './scripts/test-qbs.sh',
           }
         - {
             name: 'Run Windows tests (MinGW)',
             target: 'desktop',
-            toolchain: 'win64_mingw81',
+            toolchain: 'win64_mingw',
             testProfile: 'mingw-qt',
-            qtVersion: '5.15.2',
+            qtVersion: '6.5.0',
             script: './scripts/test-qbs.sh',
           }
     env:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41728a399..f08ed0b0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ else()
   if(NOT TARGET Qt6Core5Compat)
     add_library(Qt6Core5Compat INTERFACE)
   endif()
+  find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS DocTools)
 endif()
 
 if (QBS_INSTALL_HTML_DOCS OR QBS_INSTALL_QCH_DOCS)
diff --git a/changelogs/changes-1.14.0.md b/changelogs/changes-1.14.0.md
index 860578a15..d8a21fe51 100644
--- a/changelogs/changes-1.14.0.md
+++ b/changelogs/changes-1.14.0.md
@@ -24,12 +24,12 @@
 * Various fixes and improvements in the Debian Docker image; updated to to Qt 5.11.3.
 
 # Contributors
-* BogDan Vatra <bogdan@kde.org>
-* Christian Kandeler <christian.kandeler@qt.io>
-* Christian Stenger <christian.stenger@qt.io>
-* Davide Pesavento <pesa@gentoo.org>
-* Denis Shienkov <denis.shienkov@gmail.com>
-* hjk <hjk@qt.io>
-* Ivan Komissarov <ABBAPOH@gmail.com>
-* Joerg Bornemann <joerg.bornemann@qt.io>
-* Richard Weickelt <richard@weickelt.de>
+* BogDan Vatra
+* Christian Kandeler
+* Christian Stenger
+* Davide Pesavento
+* Denis Shienkov
+* hjk
+* Ivan Komissarov
+* Joerg Bornemann
+* Richard Weickelt
diff --git a/changelogs/changes-1.15.0.md b/changelogs/changes-1.15.0.md
index cc95011a8..390fe99dc 100644
--- a/changelogs/changes-1.15.0.md
+++ b/changelogs/changes-1.15.0.md
@@ -35,10 +35,10 @@
   Windows.
 
 # Contributors
-* Alberto Mardegan <mardy@users.sourceforge.net>
-* Christian Kandeler <christian.kandeler@qt.io>
-* Denis Shienkov <denis.shienkov@gmail.com>
-* Ivan Komissarov <ABBAPOH@gmail.com>
-* Jochen Ulrich <jochenulrich@t-online.de>
-* Joerg Bornemann <joerg.bornemann@qt.io>
-* Richard Weickelt <richard@weickelt.de>
+* Alberto Mardegan
+* Christian Kandeler
+* Denis Shienkov
+* Ivan Komissarov
+* Jochen Ulrich
+* Joerg Bornemann
+* Richard Weickelt
diff --git a/changelogs/1.24.0.md b/changelogs/changes-1.24.0.md
index 45250ec98..45250ec98 100644
--- a/changelogs/1.24.0.md
+++ b/changelogs/changes-1.24.0.md
diff --git a/changelogs/changes-2.0.1.md b/changelogs/changes-2.0.1.md
index 0f1bf4973..7f28b3e55 100644
--- a/changelogs/changes-2.0.1.md
+++ b/changelogs/changes-2.0.1.md
@@ -1,13 +1,27 @@
+# General
+* Fixed crash when importing missing JavaScript file (QBS-1730).
+
 # C/C++ Support
 * Fixed building applications with mingw toolchain and Qt6 (QBS-1724).
 
 # Apple Support
 * Added support for Xcode 14.3.
 * Fixed codesigning on macOS (QBS-1722).
+* Fixed detecting Xcode via xcode-select tool.
+
+# Qt Support
+* Fixed support for Qt 6.3 on iOS.
+* Fixed install-qt.sh to properly support Qt for iOS.
+* Do not setup Qt in qbspkgconfig when cross compiling (QBS-1717).
 
 # Build System
 * Fixed qbsbuildconfig module.
+* Fixed build with Qt6.5.
+* Updated CI to test via Qt 6.5 on macOS and Windows.
+* Updated CI to test via Xcode 14.2 on macOS.
 
 # Contributors
+* Björn Schäpers
 * Christian Kandeler
 * Ivan Komissarov
+* Kai Dohmen
diff --git a/docker-compose.yml b/docker-compose.yml
index 11ce33e24..bd1284198 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,24 +21,24 @@ services:
   focal-qt5: &focal-qt5
     << : *linux
     hostname: focal-qt5
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.20.1-2
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.24.1-0
     build:
       dockerfile: docker/focal/Dockerfile
       context: .
       args:
         QT_VERSION: 5.15.2
-        QTCREATOR_VERSION: 5.0.3
+        QTCREATOR_VERSION: 9.0.2
 
   focal-qt6:
     << : *linux
     hostname: focal-qt6
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.2.4_1.20.1-1
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.5.0_1.24.1-0
     build:
       dockerfile: docker/focal/Dockerfile
       context: .
       args:
-        QT_VERSION: 6.2.4
-        QTCREATOR_VERSION: 5.0.3
+        QT_VERSION: 6.5.0
+        QTCREATOR_VERSION: 9.0.2
 
   focal:
     << : *focal-qt5
diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile
index bc6378912..917d4d0a7 100644
--- a/docker/focal/Dockerfile
+++ b/docker/focal/Dockerfile
@@ -58,6 +58,7 @@ RUN apt-get update -qq && \
         libprotobuf-dev \
         libgrpc++-dev \
         libxkbcommon-x11-0 \
+        locales \
         nanopb \
         ninja-build \
         nsis \
@@ -77,6 +78,13 @@ RUN apt-get update -qq && \
     update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \
     pip install beautifulsoup4 lxml protobuf==3.19.1 pyyaml
 
+# Set the locale
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+    locale-gen
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
 ENV LLVM_INSTALL_DIR=/usr/lib/llvm-12
 
 
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
index 53738f46c..6bb7838f6 100644
--- a/tests/auto/blackbox/tst_blackboxqt.cpp
+++ b/tests/auto/blackbox/tst_blackboxqt.cpp
@@ -376,6 +376,7 @@ void TestBlackboxQt::pkgconfigQt()
     QbsRunParameters params("build", {"-f", "pkgconfig-qt.qbs"});
     // need to override prefix for the downloaded Qt
     params.environment.insert("PKG_CONFIG_QT5CORE_PREFIX", prefix);
+    params.environment.insert("PKG_CONFIG_QT6CORE_PREFIX", prefix);
     params.arguments << "moduleProviders.qbspkgconfig.extraPaths:" + pkgConfigPath;
     params.arguments << arguments;