From 5ac48589157ec2ad70adac97197f64594b439e9f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 10 Jan 2023 10:39:50 +0200 Subject: [PATCH] Optimize tool app config. --- qbs/imports/VApp.qbs | 5 ----- qbs/imports/VToolApp.qbs | 7 +++++++ src/app/puzzle/puzzle.qbs | 2 +- src/app/tape/tape.qbs | 2 +- src/app/valentina/valentina.qbs | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 qbs/imports/VToolApp.qbs diff --git a/qbs/imports/VApp.qbs b/qbs/imports/VApp.qbs index f2bc886ba..800898142 100644 --- a/qbs/imports/VApp.qbs +++ b/qbs/imports/VApp.qbs @@ -19,11 +19,6 @@ CppApplication { : buildconfig.installLibraryPath) } - install: true - installDir: buildconfig.installAppPath - installDebugInformation: true - type: base.concat("testSuit") - Properties { condition: qbs.targetOS.contains("unix") && buildconfig.buildWithCcache cpp.compilerWrapper: "ccache" diff --git a/qbs/imports/VToolApp.qbs b/qbs/imports/VToolApp.qbs new file mode 100644 index 000000000..e280540e5 --- /dev/null +++ b/qbs/imports/VToolApp.qbs @@ -0,0 +1,7 @@ +VApp { + version: "0.7.52" + type: base.concat("testSuit") + install: true + installDir: buildconfig.installAppPath + installDebugInformation: true +} diff --git a/src/app/puzzle/puzzle.qbs b/src/app/puzzle/puzzle.qbs index 3e43599e5..c22a34802 100644 --- a/src/app/puzzle/puzzle.qbs +++ b/src/app/puzzle/puzzle.qbs @@ -1,6 +1,6 @@ import qbs.FileInfo -VApp { +VToolApp { Depends { name: "buildconfig" } Depends { name: "ib"; condition: qbs.targetOS.contains("macos") } Depends { name: "freedesktop" } diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs index 3a582d68d..6598472a8 100644 --- a/src/app/tape/tape.qbs +++ b/src/app/tape/tape.qbs @@ -1,7 +1,7 @@ import qbs.FileInfo import qbs.File -VApp { +VToolApp { Depends { name: "buildconfig" } Depends { name: "ib"; condition: qbs.targetOS.contains("macos") } Depends { name: "freedesktop" } diff --git a/src/app/valentina/valentina.qbs b/src/app/valentina/valentina.qbs index 612a2a56f..618f703e8 100644 --- a/src/app/valentina/valentina.qbs +++ b/src/app/valentina/valentina.qbs @@ -1,7 +1,7 @@ import qbs.FileInfo import qbs.File -VApp { +VToolApp { Depends { name: "buildconfig" } Depends { name: "ib"; condition: qbs.targetOS.contains("macos") } Depends { name: "freedesktop" }