diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-18 17:13:13 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-03-19 09:03:03 +0000 |
| commit | 40baf2db26197545cac9ebe810c0399f7b10f0e8 (patch) | |
| tree | 9721ee40a58b2a197e65ed5d389eccb6518a4bb3 | |
| parent | 0d87c6251c3ed1eaa1b63847cdad15c59d867174 (diff) | |
qt6: fix setting up Qt.uitools module on Mac
Since Qt6 it is a framework, not a standalone library
Change-Id: I1561cea04a0472704d21f4ebbb5d5bc07d9c758d
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index 70acc753c..619ccf2ef 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -514,8 +514,13 @@ function isFramework(modInfo, qtProps) { if (!qtProps.frameworkBuild || modInfo.isStaticLibrary) return false; var modulesNeverBuiltAsFrameworks = [ - "bootstrap", "openglextensions", "platformsupport", "qmldevtools", "uitools", "harfbuzzng" + "bootstrap", "openglextensions", "platformsupport", "qmldevtools", "harfbuzzng" ]; + + if (qtProps.qtMajorVersion <= 5) { + modulesNeverBuiltAsFrameworks.push("uitools"); // is framework since qt6 + } + return !modulesNeverBuiltAsFrameworks.contains(modInfo.qbsName); } |