aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qbs.targetOS is not available in this place need to use a property.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-15 14:22:14 +02:00
parent d6dd3de8f1
commit 7a10fe8d80
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qbs/modules/i18n/i18n.qbs
View File

@ -211,14 +211,15 @@ Module {
readonly property string binPath: product.Qt.core.binPath readonly property string binPath: product.Qt.core.binPath
// TODO: If minimal qbs version is 1.23 replace with FileInfo.executableSuffix()
readonly property string executableSuffix: product.qbs.targetOS.contains("windows") ? ".exe" : ""
property string qtTranslationsPath property string qtTranslationsPath
configure: { configure: {
var qmakeProcess = new Process(); var qmakeProcess = new Process();
try { try {
// TODO: If minimal qbs version is 1.23 replace with FileInfo.executableSuffix() var qmakePath = FileInfo.joinPaths(binPath, "qmake" + executableSuffix);
var suffix = qbs.targetOS.contains("windows") ? ".exe" : "";
var qmakePath = FileInfo.joinPaths(binPath, "qmake" + suffix);
qmakeProcess.exec(qmakePath, ["-query"]); qmakeProcess.exec(qmakePath, ["-query"]);
if (qmakeProcess.exitCode() !== 0) { if (qmakeProcess.exitCode() !== 0) {
throw "The qmake executable '" + FileInfo.toNativeSeparators(qmakePath) + "' failed with exit code " + throw "The qmake executable '" + FileInfo.toNativeSeparators(qmakePath) + "' failed with exit code " +