diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-07-29 22:35:15 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-07-30 16:42:26 +0000 |
| commit | fda35d16f50756a8da42ad218b4055fc40c961ba (patch) | |
| tree | da6bcc435efcc9156c1af28dec8f15b5951fbce3 | |
| parent | 6fb6fcd112435faed9f05165bc4de35ebb1b8d03 (diff) | |
| download | qbs-fda35d16f50756a8da42ad218b4055fc40c961ba.tar.gz | |
xcode: Fix ApplicationExtension with XCode 12
The path constructed by Qbs when using absolute framework path instead
of it's name is no longer valid since frameworks now use .tbd files
instead of a real binary
Change-Id: I2ff1222eeac9405a8ad82f8c76f56cbeaee13995
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/imports/qbs/base/ApplicationExtension.qbs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/base/ApplicationExtension.qbs b/share/qbs/imports/qbs/base/ApplicationExtension.qbs index 140475909..eae5145ce 100644 --- a/share/qbs/imports/qbs/base/ApplicationExtension.qbs +++ b/share/qbs/imports/qbs/base/ApplicationExtension.qbs @@ -38,10 +38,13 @@ XPCService { qbs.targetOS.contains("ios") && parseInt(xcode.sdkVersion.split(".")[0], 10) < 9 cpp.entryPoint: "_NSExtensionMain" + cpp.frameworkPaths: base.concat(_useLegacyExtensionLibraries + ? qbs.sysroot + "/System/Library/PrivateFrameworks/" + : []) cpp.frameworks: { var frameworks = base.concat(["Foundation"]); if (_useLegacyExtensionLibraries) - frameworks.push(qbs.sysroot + "/System/Library/PrivateFrameworks/PlugInKit.framework"); + frameworks.push("PlugInKit"); return frameworks; } |