From f9e7b345c505856c211cd139f57316cf6989fe33 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Mon, 29 May 2023 11:53:55 +0300 Subject: Fix static plugins with Qt >= 6.5 Task-number: QBS-1732 Change-Id: I7b0037dc16eda59bfffb415c0960144ea8f2c34a Reviewed-by: Christian Kandeler --- changelogs/changes-2.0.2.md | 1 + share/qbs/module-providers/Qt/setup-qt.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 70051172c..4b8c62ca2 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -1245,7 +1245,7 @@ function allQt5Modules(qtProps, androidAbi) { } } } - if (hasV2 && !hasModuleEntry) + if (hasV2 && !hasModuleEntry && !moduleInfo.isStaticLibrary) moduleInfo.hasLibrary = false; // Fix include paths for Apple frameworks. -- cgit v1.2.3 From 1a575d27436ef71e999c709b11e6d7a24e57916e Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Mon, 29 May 2023 11:55:18 +0300 Subject: GitHub actions: bump Qt version for iOS to 6.5 Change-Id: I4e8d4374d6335b0ccb288ef692cca4003563e082 Reviewed-by: Christian Kandeler --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 814ad73eb..d81325349 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -649,7 +649,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', } - { @@ -659,7 +659,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', } - { -- cgit v1.2.3