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

FileInfo.executableSuffix() available only since qbs 1.23.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-15 11:25:35 +02:00
parent c8cee2f47f
commit 75e3e5b7b8
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qbs/modules/i18n/i18n.qbs
View File

@ -216,7 +216,8 @@ Module {
configure: { configure: {
var qmakeProcess = new Process(); var qmakeProcess = new Process();
try { 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); var qmakePath = FileInfo.joinPaths(binPath, "qmake" + suffix);
qmakeProcess.exec(qmakePath, ["-query"]); qmakeProcess.exec(qmakePath, ["-query"]);
if (qmakeProcess.exitCode() !== 0) { if (qmakeProcess.exitCode() !== 0) {

1
src/app/puzzle/puzzle.qbs
View File

@ -161,6 +161,7 @@ VToolApp {
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.defines: { cpp.defines: {
var defines = []; var defines = [];
// TODO: If minimal qbs version is 1.23 replace with FileInfo.executableSuffix()
var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; var extension = qbs.targetOS.contains("windows") ? ".exe" : "";
defines.push('PUZZLE_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"'); defines.push('PUZZLE_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"');
return defines; return defines;

1
src/app/tape/tape.qbs
View File

@ -86,6 +86,7 @@ VToolApp {
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.defines: { cpp.defines: {
var defines = []; var defines = [];
// TODO: If minimal qbs version is 1.23 replace with FileInfo.executableSuffix(
var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; var extension = qbs.targetOS.contains("windows") ? ".exe" : "";
defines.push('TAPE_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"'); defines.push('TAPE_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"');
return defines; return defines;

1
src/app/valentina/valentina.qbs
View File

@ -154,6 +154,7 @@ VToolApp {
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.defines: { cpp.defines: {
var defines = []; var defines = [];
// TODO: If minimal qbs version is 1.23 replace with FileInfo.executableSuffix(
var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; var extension = qbs.targetOS.contains("windows") ? ".exe" : "";
defines.push('VALENTINA_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"'); defines.push('VALENTINA_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"');
defines.push('TRANSLATIONS_DIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, 'translations') +'"'); defines.push('TRANSLATIONS_DIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, 'translations') +'"');