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 /share | |
| parent | e045c55d9059720ed844d3f4777539c3bc98d1bb (diff) | |
| parent | 1a575d27436ef71e999c709b11e6d7a24e57916e (diff) | |
Merge 2.0 into master
Change-Id: I76567aa0358b81da55cc2be0eee70c4c61de2b13
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 2 |
1 files changed, 1 insertions, 1 deletions
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. |