summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2023-05-01 15:29:41 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2023-05-02 10:47:44 +0000
commit36efb11629b9c40e9184842207e074f2a91c3d64 (patch)
tree762388bb7c2a019bf38ed5229691cf4508749ceb
parent67cac7b3123aa412c8c844d2c4d48b05a9ca2a3b (diff)
downloadqbs-36efb11629b9c40e9184842207e074f2a91c3d64.tar.gz
Qt support: workaround for broken iOS prfs
Change-Id: Ib0dcd880d963d25c0a8a20bb8bccfd85bcb3f510 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--share/qbs/module-providers/Qt/setup-qt.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js
index 08fc8b999..70051172c 100644
--- a/share/qbs/module-providers/Qt/setup-qt.js
+++ b/share/qbs/module-providers/Qt/setup-qt.js
@@ -768,9 +768,11 @@ function doSetupLibraries(modInfo, qtProps, debugBuild, nonExistingPrlFiles, and
var parts = extractPaths(line.slice(equalsOffset + 1).trim(), prlFilePath);
for (i = 0; i < parts.length; ++i) {
var part = parts[i];
+ var defaultInstallPrefix = "/Users/qt/work/qt/qtbase/build/target";
part = part.replace("$$[QT_INSTALL_LIBS]", qtProps.libraryPath);
part = part.replace("$$[QT_INSTALL_PLUGINS]", qtProps.pluginPath);
part = part.replace("$$[QT_INSTALL_PREFIX]", qtProps.installPrefixPath);
+ part = part.replace(defaultInstallPrefix, qtProps.installPrefixPath);
if (part.startsWith("-l")) {
libs.push(part.slice(2));
} else if (part.startsWith("-L")) {