diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-05-03 07:44:40 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-05-05 20:20:19 +0000 |
| commit | 0692b593d831e8ca84b44c1e102ed40781b1b05b (patch) | |
| tree | a06aae5cb723439bb6e96ddbbc64fdb7bda5a8b0 | |
| parent | 03e717b06ed5c0864618e763f08f91d9fc94b733 (diff) | |
| download | qbs-0692b593d831e8ca84b44c1e102ed40781b1b05b.tar.gz | |
GitHub actions: Update Qt on Windows to 6.5
Change-Id: I47c9e736e3a453660379c14276922103c3bf5daf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/workflows/main.yml | 12 | ||||
| -rw-r--r-- | 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; |