diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-05-31 10:39:01 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-05-31 10:39:01 +0200 |
| commit | 9d88f90756d8813cd9437b9a397d7bba3fff8470 (patch) | |
| tree | 8a431613af015685a49a6d63c1c1f88de75ee77c | |
| parent | e045c55d9059720ed844d3f4777539c3bc98d1bb (diff) | |
| parent | 1a575d27436ef71e999c709b11e6d7a24e57916e (diff) | |
Merge 2.0 into master
Change-Id: I76567aa0358b81da55cc2be0eee70c4c61de2b13
| -rw-r--r-- | .github/workflows/main.yml | 4 | ||||
| -rw-r--r-- | changelogs/changes-2.0.2.md | 1 | ||||
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 2 |
3 files changed, 4 insertions, 3 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', } - { diff --git a/changelogs/changes-2.0.2.md b/changelogs/changes-2.0.2.md index e848c2b40..cec220db4 100644 --- a/changelogs/changes-2.0.2.md +++ b/changelogs/changes-2.0.2.md @@ -4,6 +4,7 @@ # Qt Support * Added special handling for unclean paths in prl files (QBS-1732). +* Fixed support for static plugins and Qt >= 6.5 (QBS-1732). # Contributors * Christian Kandeler diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index 9fcef7897..b33b30e3a 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -1243,7 +1243,7 @@ function allQt5Modules(qtProps, androidAbi) { } } } - if (hasV2 && !hasModuleEntry) + if (hasV2 && !hasModuleEntry && !moduleInfo.isStaticLibrary) moduleInfo.hasLibrary = false; // Fix include paths for Apple frameworks. |