aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2023-05-31 10:39:01 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2023-05-31 10:39:01 +0200
commit9d88f90756d8813cd9437b9a397d7bba3fff8470 (patch)
tree8a431613af015685a49a6d63c1c1f88de75ee77c /.github
parente045c55d9059720ed844d3f4777539c3bc98d1bb (diff)
parent1a575d27436ef71e999c709b11e6d7a24e57916e (diff)
Merge 2.0 into master
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b27518b80..3006be6c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -643,7 +643,7 @@ jobs:
toolchain: 'ios',
xcodeVersion: '14.2',
testProfile: 'xcode_14_1-iphoneos-arm64',
- qtVersion: '6.3.2',
+ qtVersion: '6.5.0',
script: './scripts/test-qbs.sh',
}
- {
@@ -653,7 +653,7 @@ jobs:
toolchain: 'ios',
xcodeVersion: '14.2',
testProfile: 'xcode_14_1-iphonesimulator-x86_64',
- qtVersion: '6.3.2',
+ qtVersion: '6.5.0',
script: './scripts/test-qbs.sh',
}
- {