diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-01-02 02:47:06 +0300 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-01-07 16:44:59 +0000 |
commit | 5c28285248fa55167f94fc41e883e8c1f4ac0450 (patch) | |
tree | 20624db1ce75ecc8af788389b40590b1d2ac04d3 | |
parent | de28c042fa3522919cb7a8bc88ffd4be98390253 (diff) |
Fix reading .prl files located in macOS frameworks with Qt 5.14
Since Qt 5.14, prl files were moved into 'Resources' folder within a
framework
Change-Id: Ia067789032e3ac9d3bde1ad5929f2436f9341a71
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index 3ddc214d3..b5f245a12 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -631,11 +631,14 @@ function doSetupLibraries(modInfo, qtProps, debugBuild, nonExistingPrlFiles) { var prlFilePath = modInfo.isPlugin ? FileInfo.joinPaths(qtProps.pluginPath, modInfo.pluginData.type) : (modInfo.libDir ? modInfo.libDir : qtProps.libraryPath); + var libDir = prlFilePath; if (isFramework(modInfo, qtProps)) { prlFilePath = FileInfo.joinPaths(prlFilePath, libraryBaseName(modInfo, qtProps, false) + ".framework"); + libDir = prlFilePath; + if (Utilities.versionCompare(qtProps.qtVersion, "5.14") >= 0) + prlFilePath = FileInfo.joinPaths(prlFilePath, "Resources"); } - var libDir = prlFilePath; var baseName = libraryBaseName(modInfo, qtProps, debugBuild); if (!qtProps.mkspecName.startsWith("win") && !isFramework(modInfo, qtProps)) baseName = "lib" + baseName; |