diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-05-03 12:21:53 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-05-03 12:21:53 +0200 |
| commit | cdc4d8a0c694598fd4aa6ab484f562d99a094870 (patch) | |
| tree | d1703a9fcc195366ebba1a469cce43fb4d400897 /share/qbs/module-providers/Qt/setup-qt.js | |
| parent | 1f5f46e572cf7ffcd2ae4e90024349928719ba35 (diff) | |
| parent | 03e717b06ed5c0864618e763f08f91d9fc94b733 (diff) | |
| download | qbs-cdc4d8a0c694598fd4aa6ab484f562d99a094870.tar.gz | |
Merge 2.0 into master
Change-Id: I521dd5baab4b4374f9221a163ba8e83531edf8bb
Diffstat (limited to 'share/qbs/module-providers/Qt/setup-qt.js')
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 2 |
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 896b5a457..9fcef7897 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -766,9 +766,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")) { |