From 5c28285248fa55167f94fc41e883e8c1f4ac0450 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Thu, 2 Jan 2020 02:47:06 +0300 Subject: 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 --- share/qbs/module-providers/Qt/setup-qt.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3