From 75e3e5b7b8936bd9a46ec9350add8abae70aff69 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 15 Feb 2023 11:25:35 +0200 Subject: [PATCH] FileInfo.executableSuffix() available only since qbs 1.23. --- qbs/modules/i18n/i18n.qbs | 3 ++- src/app/puzzle/puzzle.qbs | 1 + src/app/tape/tape.qbs | 1 + src/app/valentina/valentina.qbs | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/qbs/modules/i18n/i18n.qbs b/qbs/modules/i18n/i18n.qbs index 777c5ae3e..3a87da7df 100644 --- a/qbs/modules/i18n/i18n.qbs +++ b/qbs/modules/i18n/i18n.qbs @@ -216,7 +216,8 @@ Module { configure: { var qmakeProcess = new Process(); try { - var suffix = FileInfo.executableSuffix(); + // TODO: If minimal qbs version is 1.23 replace with FileInfo.executableSuffix() + var suffix = qbs.targetOS.contains("windows") ? ".exe" : ""; var qmakePath = FileInfo.joinPaths(binPath, "qmake" + suffix); qmakeProcess.exec(qmakePath, ["-query"]); if (qmakeProcess.exitCode() !== 0) { diff --git a/src/app/puzzle/puzzle.qbs b/src/app/puzzle/puzzle.qbs index 661c1397b..204e23040 100644 --- a/src/app/puzzle/puzzle.qbs +++ b/src/app/puzzle/puzzle.qbs @@ -161,6 +161,7 @@ VToolApp { Depends { name: "cpp" } cpp.defines: { var defines = []; + // TODO: If minimal qbs version is 1.23 replace with FileInfo.executableSuffix() var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; defines.push('PUZZLE_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"'); return defines; diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs index b53ec97c1..4a8321e20 100644 --- a/src/app/tape/tape.qbs +++ b/src/app/tape/tape.qbs @@ -86,6 +86,7 @@ VToolApp { Depends { name: "cpp" } cpp.defines: { var defines = []; + // TODO: If minimal qbs version is 1.23 replace with FileInfo.executableSuffix( var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; defines.push('TAPE_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"'); return defines; diff --git a/src/app/valentina/valentina.qbs b/src/app/valentina/valentina.qbs index 6ff3c5f3f..8e87587cd 100644 --- a/src/app/valentina/valentina.qbs +++ b/src/app/valentina/valentina.qbs @@ -154,6 +154,7 @@ VToolApp { Depends { name: "cpp" } cpp.defines: { var defines = []; + // TODO: If minimal qbs version is 1.23 replace with FileInfo.executableSuffix( var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; defines.push('VALENTINA_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"'); defines.push('TRANSLATIONS_DIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, 'translations') +'"');