.cirrus.yml

@@ -73,7 +73,7 @@ linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
     - qbs-config defaultProfile qt5
     - qbs config profiles.qt5.baseProfile ${COMPILER}
     - qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt5 config:release
-    - xvfb-run -a qbs -p autotest-runner -d build profile:qt5 config:release
+    - xvfb-run -a qbs -p autotest-runner
 
 #macos_task_template: &MACOS_TASK_TEMPLATE
 #  << : *REGULER_TASK_TEMPLATE

qbs/imports/VApp.qbs

@@ -86,17 +86,4 @@ CppApplication {
         qbs.install: true
         qbs.installDir: buildconfig.installBinaryPath
     }
-
-    Group {
-        name: "Precompiled headers"
-        condition: buildconfig.enablePCH
-        prefix: product.sourceDirectory + "/"
-        files: {
-            var files = ["stable.h"];
-            if (qbs.toolchain.contains("msvc"))
-                files.push("stable.cpp")
-            return files;
-        }
-        fileTags: ["cpp_pch_src"]
-    }
 }

qbs/imports/VLib.qbs

@@ -31,17 +31,4 @@ Library {
         cpp.minimumMacosVersion: buildconfig.minimumMacosVersion
         bundle.isBundle: buildconfig.frameworksBuild
     }
-
-    Group {
-        name: "Precompiled headers"
-        condition: buildconfig.enablePCH
-        prefix: product.sourceDirectory + "/"
-        files: {
-            var files = ["stable.h"];
-            if (qbs.toolchain.contains("msvc"))
-                files.push("stable.cpp")
-            return files;
-        }
-        fileTags: ["cpp_pch_src"]
-    }
 }

qbs/modules/buildconfig/buildconfig.qbs

@@ -501,7 +501,6 @@ Module {
                     "-Wstrict-overflow=3",
                     "-Wstrict-overflow=4",
                     "-Wstrict-overflow=5",
-                    "-Wno-error=strict-overflow",
                     "-Wstrict-prototypes",
                     "-Wstrict-selector-match",
                     "-Wstring-compare",
@@ -706,14 +705,8 @@ Module {
 
                 if (Utilities.versionCompare(cpp.compilerVersion, "11") >= 0) {
                     debugFlags.push(
-                        "-Wctad-maybe-unsupported"
-                    )
-                }
-
-                if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos") &&
-                        Utilities.versionCompare(cpp.compilerVersion, "10") >= 0) {
-                    debugFlags.push(
-                        "-Wno-mismatched-tags" // bugged in gcc
+                        "-Wctad-maybe-unsupported",
+                        "-Wmismatched-tags" // bugged in gcc 10
                     )
                 }
 
@@ -865,4 +858,17 @@ Module {
     }
 
     vcs2.headerFileName: "vcsRepoState.h"
+
+    Group {
+        name: "Precompiled headers"
+        condition: buildconfig.enablePCH
+        prefix: product.sourceDirectory + "/"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.toolchain.contains("msvc"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
 }

src/test/CollectionTest/CollectionTest.qbs

@@ -6,13 +6,11 @@ VTestApp {
     Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
     Depends { name: "VTestLib" }
     Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
-    Depends { name: "autotest" }
 
     name: "CollectionTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
     targetName: buildconfig.appTarget
     type: base.concat("tst_files")
-    autotest.workingDir: product.buildDirectory
 
     files: [
       "qttestmainlambda.cpp",

src/test/TranslationsTest/TranslationsTest.qbs

@@ -5,12 +5,10 @@ VTestApp {
     Depends { name: "VTestLib" }
     Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
     Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
-    Depends { name: "autotest" }
 
     name: "TranslationsTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
     targetName: buildconfig.appTarget
-    autotest.workingDir: product.buildDirectory
 
     files: [
       "qttestmainlambda.cpp",

src/test/ValentinaTest/ValentinaTest.qbs

@@ -10,7 +10,6 @@ VTestApp {
     Depends { name: "VDXFLib" }
     Depends { name: "VFormatLib" }
     Depends { name: "ebr" }
-    Depends { name: "autotest" }
 
     Depends {
         name: "Qt.xmlpatterns"
@@ -21,8 +20,6 @@ VTestApp {
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "ValentinaTest" : "valentinaTest"
     targetName: buildconfig.appTarget
 
-    autotest.workingDir: product.buildDirectory
-
     files: [
         "qttestmainlambda.cpp",
         "tst_dxf.cpp",

src/test/ValentinaTest/tst_dxf.h

@@ -30,16 +30,12 @@
 
 #include <QObject>
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
-#include "../vmisc/defglobal.h"
-#endif
-
 class TST_DXF :public QObject
 {
     Q_OBJECT // NOLINT
 public:
     explicit TST_DXF(QObject *parent = nullptr);
-    ~TST_DXF() override = default;
+    ~TST_DXF() = default;
 
 private slots:
     void initTestCase();

valentina.qbs

@@ -25,16 +25,5 @@ Project {
     ]
     qbsSearchPaths: "qbs"
 
-    AutotestRunner {
-        Depends { name: "buildconfig" }
-
-        environment: {
-            var env = base;
-
-            if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")) {
-                env.push("LD_LIBRARY_PATH=" + qbs.installRoot + qbs.installPrefix + "/" + buildconfig.libDirName + "/valentina");
-            }
-            return env;
-        }
-    }
+    AutotestRunner {}
 }