From 3af79ccfcc48949927dc91803e29650cf735356a Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Tue, 10 Jan 2023 10:02:30 +0200
Subject: [PATCH] Optimize unit test app config.

---
 qbs/imports/VTestApp.qbs                       | 6 ++++++
 src/test/CollectionTest/CollectionTest.qbs     | 7 ++-----
 src/test/ParserTest/ParserTest.qbs             | 6 +-----
 src/test/TranslationsTest/TranslationsTest.qbs | 6 +-----
 src/test/ValentinaTest/ValentinaTest.qbs       | 6 +-----
 5 files changed, 11 insertions(+), 20 deletions(-)
 create mode 100644 qbs/imports/VTestApp.qbs

diff --git a/qbs/imports/VTestApp.qbs b/qbs/imports/VTestApp.qbs
new file mode 100644
index 000000000..c1c06bea7
--- /dev/null
+++ b/qbs/imports/VTestApp.qbs
@@ -0,0 +1,6 @@
+VApp {
+    type: base.concat("autotest")
+    bundle.isBundle: false
+    install: false
+    condition: buildconfig.enableUnitTests
+}
diff --git a/src/test/CollectionTest/CollectionTest.qbs b/src/test/CollectionTest/CollectionTest.qbs
index 951b32bb9..ea7403271 100644
--- a/src/test/CollectionTest/CollectionTest.qbs
+++ b/src/test/CollectionTest/CollectionTest.qbs
@@ -1,7 +1,7 @@
 import qbs.FileInfo
 import qbs.File
 
-VApp {
+VTestApp {
     Depends { name: "buildconfig" }
     Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
     Depends { name: "VTestLib" }
@@ -9,10 +9,7 @@ VApp {
     name: "CollectionTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
     targetName: buildconfig.appTarget
-    type: base.concat("autotest", "tst_files")
-    bundle.isBundle: false
-    install: false
-    condition: buildconfig.enableUnitTests
+    type: base.concat("tst_files")
 
     files: [
       "qttestmainlambda.cpp",
diff --git a/src/test/ParserTest/ParserTest.qbs b/src/test/ParserTest/ParserTest.qbs
index 9f2b035fa..a00289df3 100644
--- a/src/test/ParserTest/ParserTest.qbs
+++ b/src/test/ParserTest/ParserTest.qbs
@@ -1,15 +1,11 @@
-VApp {
+VTestApp {
     Depends { name: "buildconfig" }
     Depends { name: "QMUParserLib" }
 
     name: "ParserTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "ParserTest" : "parserTest"
     targetName: buildconfig.appTarget
-    type: base.concat("autotest")
     consoleApplication: true
-    bundle.isBundle: false
-    install: false
-    condition: buildconfig.enableUnitTests
 
     files: [
       "main.cpp"
diff --git a/src/test/TranslationsTest/TranslationsTest.qbs b/src/test/TranslationsTest/TranslationsTest.qbs
index d15e55b24..ea1804a95 100644
--- a/src/test/TranslationsTest/TranslationsTest.qbs
+++ b/src/test/TranslationsTest/TranslationsTest.qbs
@@ -1,6 +1,6 @@
 import qbs.FileInfo
 
-VApp {
+VTestApp {
     Depends { name: "buildconfig" }
     Depends { name: "VTestLib" }
     Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
@@ -8,10 +8,6 @@ VApp {
     name: "TranslationsTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
     targetName: buildconfig.appTarget
-    type: base.concat("autotest")
-    bundle.isBundle: false
-    install: false
-    condition: buildconfig.enableUnitTests
 
     files: [
       "qttestmainlambda.cpp",
diff --git a/src/test/ValentinaTest/ValentinaTest.qbs b/src/test/ValentinaTest/ValentinaTest.qbs
index 657db4dbc..9febfe377 100644
--- a/src/test/ValentinaTest/ValentinaTest.qbs
+++ b/src/test/ValentinaTest/ValentinaTest.qbs
@@ -1,4 +1,4 @@
-VApp {
+VTestApp {
     Depends { name: "buildconfig" }
     Depends { name: "VTestLib" }
     Depends { name: "Qt"; submodules: ["testlib"] }
@@ -11,10 +11,6 @@ VApp {
     name: "ValentinaTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "ValentinaTest" : "valentinaTest"
     targetName: buildconfig.appTarget
-    type: base.concat("autotest")
-    bundle.isBundle: false
-    install: false
-    condition: buildconfig.enableUnitTests
 
     files: [
       "qttestmainlambda.cpp",