Successful build of test binaries.

src/app/puzzle/puzzle.qbs

@@ -10,6 +10,11 @@ VApp {
     Depends { name: "VWidgetsLib" }
     Depends { name: "FervorLib" }
 
+    Properties {
+        condition: cpp.defines.contains("APPIMAGE")
+        cpp.dynamicLibraries: ["icudata", "icui18n", "icuuc"]
+    }
+
     name: "Puzzle"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Puzzle" : "puzzle"
     targetName: buildconfig.appTarget
@@ -163,8 +168,5 @@ VApp {
         fileTags: ["cpp_pch_src"]
     }
 
-    cpp.includePaths: {
+    cpp.includePaths: [product.sourceDirectory]
-        console.info(product.sourceDirectory)
-        return product.sourceDirectory
-    }
 }

src/app/tape/tape.qbs

@@ -12,6 +12,11 @@ VApp {
     Depends { name: "VWidgetsLib"; }
     Depends { name: "VToolsLib"; }
 
+    Properties {
+        condition: cpp.defines.contains("APPIMAGE")
+        cpp.dynamicLibraries: ["icudata", "icui18n", "icuuc"]
+    }
+
     name: "Tape"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Tape" : "tape"
     targetName: buildconfig.appTarget
@@ -81,7 +86,7 @@ VApp {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/app/valentina/valentina.qbs

@@ -19,6 +19,11 @@ VApp {
         required: false
     }
 
+    Properties {
+        condition: cpp.defines.contains("APPIMAGE")
+        cpp.dynamicLibraries: ["icudata", "icui18n", "icuuc"]
+    }
+
     name: "Valentina"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Valentina" : "valentina"
     targetName: buildconfig.appTarget
@@ -160,7 +165,7 @@ VApp {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/fervor/fervor.qbs

@@ -17,7 +17,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/ifc/ifc.qbs

@@ -74,7 +74,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/qmuparser/qmuparser.qbs

@@ -37,7 +37,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vdxf/vdxf.qbs

@@ -49,7 +49,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vformat/vformat.qbs

@@ -20,7 +20,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vgeometry/vgeometry.qbs

@@ -56,7 +56,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vlayout/vlayout.qbs

@@ -76,7 +76,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vmisc/vmisc.qbs

@@ -123,7 +123,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vobj/vobj.qbs

@@ -16,7 +16,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vpatterndb/vpatterndb.qbs

@@ -103,7 +103,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vpropertyexplorer/vpropertyexplorer.qbs

@@ -91,7 +91,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vtest/vtest.qbs

@@ -14,7 +14,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vtools/vtools.qbs

@@ -471,7 +471,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/libs/vwidgets/vwidgets.qbs

@@ -65,7 +65,7 @@ VLib {
         name: "Precompiled headers"
         files: {
             var files = ["stable.h"];
-            if (qbs.targetOS.contains("windows"))
+            if (qbs.toolchain.contains("msvc"))
                 files.push("stable.cpp")
             return files;
         }

src/src.qbs

@@ -2,6 +2,6 @@ Project {
     references: [
         "app/app.qbs",
         "libs/libs.qbs",
-        //"test/test.qbs",
+        "test/test.qbs",
     ]
 }

src/test/CollectionTest/CollectionTest.qbs

@@ -0,0 +1,31 @@
+VApp {
+    Depends { name: "buildconfig" }
+    Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
+    Depends { name: "VTestLib" }
+
+    name: "CollectionTest"
+    buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
+    targetName: buildconfig.appTarget
+    type: base.concat("autotest")
+    bundle.isBundle: false
+    install: false
+
+    files: [
+      "qttestmainlambda.cpp",
+      "tst_tapecommandline.cpp",
+      "tst_valentinacommandline.cpp",
+      "tst_tapecommandline.h",
+      "tst_valentinacommandline.h",
+    ]
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.toolchain.contains("msvc"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+}

src/test/ParserTest/ParserTest.qbs

@@ -0,0 +1,27 @@
+VApp {
+    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
+
+    files: [
+      "main.cpp"
+    ]
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.toolchain.contains("msvc"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+}

src/test/TranslationsTest/TranslationsTest.qbs

@@ -0,0 +1,45 @@
+import qbs.FileInfo
+
+VApp {
+    Depends { name: "buildconfig" }
+    Depends { name: "VTestLib" }
+    Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
+
+    name: "TranslationsTest"
+    buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
+    targetName: buildconfig.appTarget
+    type: base.concat("autotest")
+    bundle.isBundle: false
+    install: false
+
+    files: [
+      "qttestmainlambda.cpp",
+      "tst_measurementregexp.cpp",
+      "tst_qmuparsererrormsg.cpp",
+      "tst_tstranslation.cpp",
+      "tst_buitinregexp.cpp",
+      "tst_abstractregexp.cpp",
+      "tst_tslocaletranslation.cpp",
+      "tst_abstracttranslation.cpp",
+      "tst_measurementregexp.h",
+      "tst_qmuparsererrormsg.h",
+      "tst_tstranslation.h",
+      "tst_buitinregexp.h",
+      "tst_abstractregexp.h",
+      "tst_tslocaletranslation.h",
+      "tst_abstracttranslation.h",  
+    ]
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.toolchain.contains("msvc"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    cpp.defines: 'TS_DIR="' + FileInfo.joinPaths(project.sourceDirectory, "share", "translations")  + '"'
+}

src/test/ValentinaTest/ValentinaTest.qbs

@@ -0,0 +1,77 @@
+VApp {
+    Depends { name: "buildconfig" }
+    Depends { name: "VTestLib" }
+    Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
+    Depends { name: "VMiscLib" }
+    Depends { name: "VToolsLib" }
+
+    name: "ValentinaTest"
+    buildconfig.appTarget: qbs.targetOS.contains("macos") ? "ValentinaTest" : "valentinaTest"
+    targetName: buildconfig.appTarget
+    type: base.concat("autotest")
+    bundle.isBundle: false
+    install: false
+
+    files: [
+      "qttestmainlambda.cpp",
+      "tst_dxf.cpp",
+      "tst_vdomdocument.cpp",
+      "tst_vposter.cpp",
+      "tst_vspline.cpp",
+      "tst_nameregexp.cpp",
+      "tst_vlayoutdetail.cpp",
+      "tst_varc.cpp",
+      "tst_qmutokenparser.cpp",
+      "tst_vmeasurements.cpp",
+      "tst_vlockguard.cpp",
+      "tst_misc.cpp",
+      "tst_vcommandline.cpp",
+      "tst_vpiece.cpp",
+      "tst_vabstractcurve.cpp",
+      "tst_findpoint.cpp",
+      "tst_vellipticalarc.cpp",
+      "tst_vcubicbezierpath.cpp",
+      "tst_vgobject.cpp",
+      "tst_vsplinepath.cpp",
+      "tst_vpointf.cpp",
+      "tst_readval.cpp",
+      "tst_vtranslatevars.cpp",
+      "tst_vabstractpiece.cpp",
+      "tst_vtooluniondetails.cpp",
+      "tst_dxf.h",
+      "tst_vdomdocument.h",
+      "tst_vposter.h",
+      "tst_vspline.h",
+      "tst_nameregexp.h",
+      "tst_vlayoutdetail.h",
+      "tst_varc.h",
+      "tst_qmutokenparser.h",
+      "tst_vmeasurements.h",
+      "tst_vlockguard.h",
+      "tst_misc.h",
+      "tst_vcommandline.h",
+      "tst_vpiece.h",
+      "tst_vabstractcurve.h",
+      "tst_findpoint.h",
+      "tst_vellipticalarc.h",
+      "tst_vcubicbezierpath.h",
+      "tst_vgobject.h",
+      "tst_vsplinepath.h",
+      "tst_vpointf.h",
+      "tst_readval.h",
+      "tst_vtranslatevars.h",
+      "tst_vabstractpiece.h",
+      "tst_vtooluniondetails.h", 
+    ]
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.toolchain.contains("msvc"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+}

src/test/test.qbs

@@ -0,0 +1,8 @@
+Project {
+    references: [
+        "ParserTest/ParserTest.qbs",
+        "ValentinaTest/ValentinaTest.qbs",
+        "TranslationsTest/TranslationsTest.qbs",
+        "CollectionTest/CollectionTest.qbs"
+    ]
+}