From 0692b593d831e8ca84b44c1e102ed40781b1b05b Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Wed, 3 May 2023 07:44:40 +0300 Subject: GitHub actions: Update Qt on Windows to 6.5 Change-Id: I47c9e736e3a453660379c14276922103c3bf5daf Reviewed-by: Christian Kandeler --- .github/workflows/main.yml | 12 ++++++------ tests/auto/blackbox/tst_blackboxqt.cpp | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d66a5b461..814ad73eb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -744,15 +744,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', } - { @@ -760,15 +760,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/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; -- cgit v1.2.1 From c0d45d2edd56e299d5a4a7a8303a42b4c8ee9fbd Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Fri, 5 May 2023 19:59:50 +0300 Subject: Update changelog Change-Id: Ie0f066ae6caddf2643f5b1696eab37fe2d5088e7 Reviewed-by: Christian Kandeler --- changelogs/changes-2.0.1.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 -- cgit v1.2.1 From 589c5b0aa667d176dc8b18202ef3d04474d14246 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Fri, 5 May 2023 21:02:09 +0200 Subject: docker: Update focal images Change-Id: Ide8cb42abc270bb691b2f4caff6412531cbaf50a Reviewed-by: Christian Kandeler --- docker-compose.yml | 10 +++++----- docker/focal/Dockerfile | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ceedef4a7..23a27204d 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 -- cgit v1.2.1 From a851f36197330096ff44234487c0f5b4b2da3ef5 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sat, 6 May 2023 22:27:57 +0300 Subject: cmake: fix qt5 build Without the DocTools package, Qt5::qdoc target is not available. This amends e7763d972a4404b283260d29ebf7720a981349cb. Change-Id: I10a9a32686e816e65bdfdcc7a70c34d89f71c448 Reviewed-by: Dmitry Shachnev Reviewed-by: Christian Kandeler --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) 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) -- cgit v1.2.1 From 97c7f802ef065b6133fc075d1559ede4952bf872 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Thu, 11 May 2023 01:38:30 +0300 Subject: fix changelogs Choco complains about e-mails in nuspec which contains all release notes. Remove e-mails from old changelogs. Also, fix the name of the file for 1.24.0 release. Change-Id: I9e0e305283c224f7fc5c3a76456efe474b7ccd4c Reviewed-by: Christian Kandeler --- changelogs/1.24.0.md | 12 ------------ changelogs/changes-1.14.0.md | 18 +++++++++--------- changelogs/changes-1.15.0.md | 14 +++++++------- changelogs/changes-1.24.0.md | 12 ++++++++++++ 4 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 changelogs/1.24.0.md create mode 100644 changelogs/changes-1.24.0.md diff --git a/changelogs/1.24.0.md b/changelogs/1.24.0.md deleted file mode 100644 index 45250ec98..000000000 --- a/changelogs/1.24.0.md +++ /dev/null @@ -1,12 +0,0 @@ -# General -* Users can now control if and when warnings for deprecated properties are emitted. -* Added FileInfo.executableSuffix(). - -# Qt Support -* Minimum windows version is now 10.0, like for cmake and qmake. - -# Contributors -* Christian Kandeler -* Ivan Komissarov -* Petr Mikhalicin -* Raphael Cotty 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 -* Christian Kandeler -* Christian Stenger -* Davide Pesavento -* Denis Shienkov -* hjk -* Ivan Komissarov -* Joerg Bornemann -* Richard Weickelt +* 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 -* Christian Kandeler -* Denis Shienkov -* Ivan Komissarov -* Jochen Ulrich -* Joerg Bornemann -* Richard Weickelt +* Alberto Mardegan +* Christian Kandeler +* Denis Shienkov +* Ivan Komissarov +* Jochen Ulrich +* Joerg Bornemann +* Richard Weickelt diff --git a/changelogs/changes-1.24.0.md b/changelogs/changes-1.24.0.md new file mode 100644 index 000000000..45250ec98 --- /dev/null +++ b/changelogs/changes-1.24.0.md @@ -0,0 +1,12 @@ +# General +* Users can now control if and when warnings for deprecated properties are emitted. +* Added FileInfo.executableSuffix(). + +# Qt Support +* Minimum windows version is now 10.0, like for cmake and qmake. + +# Contributors +* Christian Kandeler +* Ivan Komissarov +* Petr Mikhalicin +* Raphael Cotty -- cgit v1.2.1