diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2022-03-28 16:33:49 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-03-30 11:20:45 +0000 |
| commit | 7259f0db9ca51947630abfc2f813d16e9f4a8945 (patch) | |
| tree | f55163a76747eaddb62036eff8d011e42a3b834e /share | |
| parent | e01a68e82e89cefab8e3b1f5bd8efee1a92463f5 (diff) | |
| download | qbs-7259f0db9ca51947630abfc2f813d16e9f4a8945.tar.gz | |
Qt support: Fix wrong lib file path deduction for "external" modules
The list of libraries can contain names (e.g. "m" or "z") rather than
file paths, in which case we must not use it to guess the module's
library file.
Amends c82daaac43.
Change-Id: I10fd6e1fcc8268adbc595345af80955be0dba5ec
Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index c7efef014..72b21c395 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -792,12 +792,12 @@ function doSetupLibraries(modInfo, qtProps, debugBuild, nonExistingPrlFiles, and } catch (e) { // qt_ext_lib_extX.pri (usually) don't have a corresponding prl file. // So the pri file variable QMAKE_LIBS_LIBX points to the library - if (modInfo.isExternal ) { + if (modInfo.isExternal) { libFilePath = debugBuild ? modInfo.staticLibrariesDebug[0] : modInfo.staticLibrariesRelease[0]; - } else { - libFilePath = guessLibraryFilePath(prlFilePath, libDir, qtProps); } + if (!libFilePath || !File.exists(libFilePath)) + libFilePath = guessLibraryFilePath(prlFilePath, libDir, qtProps); if (nonExistingPrlFiles.contains(prlFilePath)) return; nonExistingPrlFiles.push(prlFilePath); |